Team 3
Merge pull request #4 from jaffe-teststudent3/master

Team 3