masking echt echt gefixt
Merge branch 'master' of https://github.com/matsvm/Maurice

Conflicts:
	js/classes/Game.js