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