Dropped a couple lines
Also messing around with branches
Removed Makefile.in
...why was it even in the repo?
Revert "Removed Makefile.in"
I broke build, didn't think this file was important, it actually is...
I should probably sleep soon...
This reverts commit e34a99c28d1a4a9b366ac1e9947216cc1048a3ac.
Hopefully a final change for now
Zzzzzz...
Merge branch 'master' into smdFile
Fixed the conflict, and updated Makefile.in
Conflicts:
	Makefile.am