player stuff
Merge branch 'master' of https://github.com/mwong56/hackergames2014

Conflicts:
	MensRoom/MensRoom.csproj