some chang4es to the screen
Merge branch 'develop' of github.com:psyburn/oboji.se into develop

Conflicts:
	app/scripts/game-screens.js