Added my branch from the team's code as a seperate file
Merge pull request #2 from jaydlawrence/master

Add updated version of team 2's solution.

Thanks!