3 commits

Author	SHA1	Message	Date
Daniel Flanagan	2fbcbe8a24	laptop fixes	2017-02-11 14:00:54 -06:00
Daniel Flanagan	4b0951b7ab	getting ready for the merge - I'm sure this will end badly	2017-02-10 11:23:52 -06:00
Daniel Flanagan	b1f910e0a0	stuff	2017-02-07 16:16:45 -06:00