Some testing changes that will soon be overwriteen

commiting so I can pull from Bos branch
Merge remote-tracking branch 'origin/bos' into Micah

Conflicts:
	PacManMulti/PacManMulti/GameMaster.cs
	PacManMulti/PacManMulti/Logic/GameLogic.cs
	PacManMulti/PacManMulti/PacManMulti.csproj
	PacManMulti/PacManMulti/UI/Sprites/StaticSprite.cs
	PacManMulti/PacManMulti/Xbox 360 Copy of PacManMulti.csproj

updating my code
need to commit
Almost there now with working boardUI

BoardUI might need a little tweeking but is almost done
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/bos' into Micah
Some Minor updates

updating to merge
Merge branch 'Micah' of https://github.com/TeamAwesome5u/Pacman into Micah
Merge remote-tracking branch 'origin/Micah'
Commit
Menu launches game

Menu launches the game with the correct number of players being created.
Updated Controller, still some errors...
Merge remote-tracking branch 'origin/Micah' into Micah

Conflicts:
	PacManMulti/PacManMulti/Elements/Element.cs
	PacManMulti/PacManMulti/Logic/GameLogicClassic.cs
updating my branch

some wird refernce erros but we are merging right now
update
fixing some left over merge cruft

STAY OUT OF MY BRANCH YOU N00BS I like my code working except for when I
break it. Let me have the privlige of being the only one to ruin my
code!!!!
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