Added Team 2's code
Merge pull request #3 from hargriffle/master

Added Team 2's code