Merge pull request #2 from GreatBigBore/master

Grader comments
Updated Makefile
Updated Makefile
Merge branch 'master' of github.com:Riannon/CSCI-21-SPRING-2014
Completed File