change
Merge branch 'master' of https://github.com/jinwolf/WalkingDead

Conflicts:
	GameEngine.js