fixed title
Fixed bug
Fixed bug
Merge branch 'master' into tetriso-dev

Conflicts:
	src/game.html
	src/js/Playfield.js