added makefile!
Merge branch 'master' of https://github.com/jdestupinan1332/Hw6