Merge pull request #20 from stuycs-softdev/master

asdfasfasdfas
asdf
Merge branch 'Timothy' of https://github.com/stuycs-softdev/proj3-6-JJTS into Timothy
asdf
Merge pull request #21 from stuycs-softdev/Timothy

Timothy
Merge branch 'master' into Simon