Merge pull request #1 from level1kid/cleanup

Cleanup
fixing makefiles pt.1
fixing makefiles pt.2