2 commits

Author	SHA1	Message	Date
Daniel Flanagan	46d6ad4258	fix merge issues	2016-07-31 21:05:14 -05:00
Daniel Flanagan	54a50ebf48	fix more things	2016-07-29 20:08:47 -05:00