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
Merge remote-tracking branch 'origin/Micah' into JacobWorkingBranch

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

Updating Jacob
Comit
add the PacFont to the project kind of

Why is this stupid font fouling up my complier!?!?