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

Conflicts:
	Pacman/Entity.h