Merge pull request #8 from stuycs-ml7-projects/patrick

Sorry about the self-merge, but no one else is awake!