test merge 2
Merge branch 'master' of https://github.com/1karu5/CuRvE

Conflicts:
	game.js