Merge pull request #16 from stuycs-softdev/master

asdf
asdf
Merge pull request #17 from stuycs-softdev/Timothy

Timothy