Fixed bug and now correctly redirecting to game does not exist
Merge branch 'dev' into UI
Added timer for game
Added timer
Merge branch 'UI' into dev

Conflicts:
	public/styles/main.css
	public/views/game.html
Merge pull request #47 from malucky/dev

Added countdown timer and game timer