Edited enemy and pacmanPhase
Merge branch 'master' of https://github.com/2machten/pixel-evolution

Conflicts:
	js/state/pacmanPhase.js