makefile changes
Merge branch 'master' of https://github.com/antsao/FinalProgram