comit
Merge remote-tracking branch 'origin/JacobWorkingBranch' into JacobWorkingBranch

Conflicts:
	PacManMulti/PacManMulti/Elements/Element.cs
	PacManMulti/PacManMulti/Elements/Item.cs
	PacManMulti/PacManMulti/GameMaster.cs
	PacManMulti/PacManMulti/Logic/GameLogic.cs

updating