stuff
Merge branch 'master' of github.com:AlisaEx/BorgGameV1

Conflicts:
	game.js