Ready to check in
Merge branch 'master' of github.com:GreatBigBore/CSCI-21-SPRING-2014