Loads of stuff
Merge branch 'master' of https://github.com/TeamGLPacman/Pacman

Conflicts:
	Pacman/Entity.h
	Pacman/GameCore.cpp
	Pacman/GameCore.h
	Pacman/Pacman.h
	Pacman/Pacman.vcxproj.filters
	Pacman/PowerPacman.h