Merge pull request #1 from Szune/beta

Changed some capitalization to be more consistent
fixed capitalization and design stuff
Merge branch 'beta' into stable

Conflicts:
	PacMan.suo
Merge branch 'stable' of https://github.com/Szune/ErikPacMan into stable
Merge pull request #2 from Szune/stable

Fixed mistakes