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

Merge branch 'Timothy' of https://github.com/stuycs-softdev/proj3-6-JJTS...