First quarter of team team puzzle
Merge branch 'master' of https://github.com/dneathery/TheTeamGame

Conflicts:
	TeamGame/TeamGame/TeamGameContent/TeamGameContent.contentproj