test
Merge branch 'master' of github.com:makeros/game-off-2013

Conflicts:
	app/styles/main.scss
Merge branch 'master' of github.com:makeros/snak3Dy
fixed last snake segment left on start on board