event trigger bugfix
Merge branch 'develop' of github.com:psyburn/oboji.se into develop
better score monitoring, leaveRoom bugfixes
game screen
Merge branch 'develop' of https://github.com/psyburn/oboji.se into develop

* 'develop' of https://github.com/psyburn/oboji.se:
  better score monitoring, leaveRoom bugfixes
  event trigger bugfix
started working on screen logic
added username into localStorage
added network game lobby screen
toggle switch
private show/hide
added onScreenShown
smaall changes
Merge branch 'feature/screens' of https://github.com/psyburn/oboji.se into feature/screens

* 'feature/screens' of https://github.com/psyburn/oboji.se:
  added onScreenShown
  private show/hide
  toggle switch
  added network game lobby screen
  added username into localStorage
  started working on screen logic

Conflicts:
	app/index.html
	app/scripts/game-screens.js