JLMEK
Merge branch 'master' of https://github.com/bartboogmans/MinorProject12

Conflicts:
	Pac-Pro_Evolution/src/gameEngine/Player.java