zamiast oceny - teatr
Merge branch 'master' of ssh://lernhub.pl/~/game
add credits and main
Merge branch 'master' of github.com:OlgaRybacka/GameDemo into final

Conflicts:
	app/assets/javascripts/game/game.js.coffee
	app/assets/stylesheets/game/layout.css.sass
Merge branch 'final' of github.com:OlgaRybacka/GameDemo into final

Conflicts:
	app/assets/javascripts/game/game.js.coffee
	app/assets/javascripts/game/resize.js.coffee