Merge pull request #1 from jaffe-teststudent2/master

Added Team 1
Team 2