Merge pull request #17 from stuycs-softdev/Timothy

Timothy