Fixed bug and now correctly redirecting to game does not exist
Merge branch 'dev' into UI
Added timer for game
Merge pull request #46 from deini/dev

CSS
updated nav bar with logo BattleJS
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
disabled buttons
toggled disabled buttons
created chat div
added firebase initialized
Chat functioning and ng-sanitize added
Sanitizes inputs
keeps track of sockets
implemented fixed nav footer
timer save and fixed socket disconnect
Merge pull request #48 from wgester/dev

firebase chat, socket disconnects
implemented console footer
Merge branch 'nav' into dev

Conflicts:
	public/scripts/controllers/main.js
	public/styles/main.css
	public/views/game.html