for 2/26
Merge branch 'master' of github.com:rickshere/CSCI-21-SPRING-2014