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

... into Timothy