Cleaning up Makefiles
Merge branch 'master' of https://github.com/evfrancis/Practice