second commit
Merge branch 'master' of https://github.com/ricemitc/CSCI-1301