Clearing some cruft from master

Unbreaking previous commit
Merge branch 'master' of github.com:daruane/cs4098-Project