cleaned up makefile
Merge branch 'master' of https://github.com/mmaisel/cs550-group7