modified
Merge branch 'master' of http://github.com/stuycs-softdev/proj3-7-SINGalong