Other stuff
Merge branch 'master' of https://github.com/dneathery/TheTeamGame

Conflicts:
	TeamGame/TeamGame/TeamGame/Net.cs
	TeamGame/TeamGame/TeamGame/Player.cs