gameplay
Merge remote-tracking branch 'origin/master'

Conflicts:
	Merkel.js
	game.js