unknown changes
Merge branch 'final' of https://github.com/OlgaRybacka/GameDemo into final
Merge branch 'final' of https://github.com/OlgaRybacka/GameDemo into final

Conflicts:
	app/assets/stylesheets/game/layout.css.sass