Pulling in Clayton's changes
Merge branch 'master' of https://github.com/cjrieck/HackMIT-Project