add flatui
Merge branch 'flat' into devTemp

Conflicts:
	public/index.html
	public/views/main.html
Merge pull request #43 from wgester/dev

comparisons and promises
begin flat ui integration
Merge branch 'devTemp' into dev
Merge pull request #44 from alexmckenley/dev

Begin UI work
Fixed bug and now correctly redirecting to game does not exist
Merge branch 'dev' into UI
css issues
Merge pull request #45 from alexmckenley/dev

css issues
Added timer for game
CSS
Merge pull request #46 from deini/dev

CSS
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