Fixed

Did all the things
Merge remote-tracking branch 'origin/JacobWorkingBranch' into Micah

Conflicts:
	PacManMulti/PacManMulti/Controllers/Controller.cs
	PacManMulti/PacManMulti/Logic/GameLogic.cs

Please compile!