Merge branch 'Micah' of github.com:TeamAwesome5u/Pacman into bos
Merge branch 'Micah' of github.com:TeamAwesome5u/Pacman into bos
Updated the GameLogic and Element classes to fix unimplemented methods
Merge branch 'Micah' of github.com:TeamAwesome5u/Pacman into bos
This version actually works! You can now run the program and display the
BoardUI and the board full of elements on it.
Xbox works!!!! All changes in the normal project will be automatically
updated in the Xbox test project. Also, no compile or runtime errors.
Somehow I accidentally moved Game. Fixed.
Added animated sprites and fixed stuff
oops wrong branch
Merge pull request #23 from TeamAwesome5u/bos

Updating Louis' code
Merge pull request #24 from TeamAwesome5u/Louis

Merge pull request #23 from TeamAwesome5u/bos
Merge branch 'master' into bos

Conflicts:
	PacManMulti/PacManMulti/GameMaster.cs
	PacManMulti/PacManMulti/PacManMulti.csproj
	PacManMulti/PacManMulti/UI/BoardUI.cs
	PacManMulti/PacManMulti/UI/Sprite.cs
	PacManMulti/PacManMulti/UI/Sprites/Sprite.cs
	PacManMulti/PacManMulti/Xbox 360 Copy of PacManMulti.csproj
	Xbox360GameTest/Xbox360GameTest/UI/Sprites/Sprite.cs

 On branch bos
	deleted:    PacManMulti/PacManMulti/Controllers/Controller.cs
	deleted:    PacManMulti/PacManMulti/Controllers/ControllerScheme.cs
	deleted:    PacManMulti/PacManMulti/Controllers/GhostAIController.cs
	deleted:    PacManMulti/PacManMulti/Controllers/KeyboardController.cs
	modified:   PacManMulti/PacManMulti/Controllers/KeyboardInput.cs
	deleted:    PacManMulti/PacManMulti/Controllers/PacplayerAIController.cs
	deleted:    PacManMulti/PacManMulti/Controllers/XboxController.cs
	modified:   PacManMulti/PacManMulti/GameMaster.cs
	modified:   PacManMulti/PacManMulti/PacManMulti.csproj
	modified:   PacManMulti/PacManMulti/UI/BoardUI.cs
	modified:   PacManMulti/PacManMulti/Xbox 360 Copy of PacManMulti.csproj
Merge pull request #25 from TeamAwesome5u/bos

final merge request with Bos's branch