weekends work, possibly working?
Merge branch 'master' of https://github.com/ThatCrazyIrishGuy/CardsAgainstHumanityCS

Conflicts:
	CardsAgainstHumanity/Program.cs
	Server/Player.cs
	Server/Program.cs
	Server/Server.csproj
recommit