Merge branch 'master' of github.com:TeamAwesome5u/Pacman

Conflicts:
	PacManMulti/PacManMulti/Elements/Element.cs
	PacManMulti/PacManMulti/Elements/PacPlayer.cs
	PacManMulti/PacManMulti/GameMaster.cs
	PacManMulti/PacManMulti/Logic/Board.cs
	PacManMulti/PacManMulti/PacManMulti.csproj
	PacManMulti/PacManMulti/UI/BoardUI.cs
	PacManMulti/PacManMulti/UI/SpriteDemo.cs

Trying to commit a merge. This is not a good commit. Untested.
Revert "Deleted useless file"

This reverts commit fc63228eb3cdbd7456768ab208d86822cd8f9326.

Conflicts:

Don't know why I have to commit this...
Revert "Deleted useless file"
Time to revert finally
This reverts commit fc63228eb3cdbd7456768ab208d86822cd8f9326.

Conflicts:
Merge branch 'master' of github.com:TeamAwesome5u/Pacman

Conflicts:
	PacManMulti/PacManMulti/Logic/Board.cs
Merge branch 'master' of github.com:TeamAwesome5u/Pacman into bos

Conflicts:
	PacManMulti/PacManMulti/Elements/Element.cs
	PacManMulti/PacManMulti/Elements/PacPlayer.cs
	PacManMulti/PacManMulti/GameMaster.cs
	PacManMulti/PacManMulti/Logic/Board.cs
	PacManMulti/PacManMulti/PacManMulti.csproj
	PacManMulti/PacManMulti/UI/BoardUI.cs
	PacManMulti/PacManMulti/UI/SpriteDemo.cs
Please no