Team 2
Merge pull request #3 from jaffe-teststudent2/master

Team 2