fixed after conflict

Signed-off-by: szydan <danielczyk.szymon@gmail.com>
Merge branch 'gh-pages' of github.com:szydan/game into gh-pages

Signed-off-by: szydan <danielczyk.szymon@gmail.com>

Conflicts:
	game.html