ready to grade 4/14/14
Merge branch 'master' of github.com:lovodi/CSCI-21