By Pierce
Merge branch 'master' of https://github.com/clnye15/CS-Final-Project-Prototype