Merge pull request #2 from GreatBigBore/master

Grader comments
makeup work
Merge branch 'master' of github.com:staylor014/CSCI-21-SPRING-2014
makeup work
makeup work
Merge trouble