Merge pull request #1 from GreatBigBore/master

pc4 graded 2014.02.05
3/10
Merge branch 'master' of github.com:rickshere/CSCI-21-SPRING-2014
pc12 graded 2014.03.12