Merge pull request #19 from stuycs-softdev/Timothy

Merge pull request #18 from stuycs-softdev/master
asdf
Merge branch 'master' of https://github.com/stuycs-softdev/proj3-6-JJTS
Merge pull request #20 from stuycs-softdev/master

asdfasfasdfas