Added css for front page
Adding watcher on server after client routed to watcher. updating watcher view right away rather than waiting for a subsequent change
Merge branch 'dev' into UI

Conflicts:
	app/sockets.js
	public/scripts/controllers/watch.js
Merge pull request #39 from deini/dev

Fixed testHelpers variable getting replaced and 'submit' event not passing functionName
Refactored ready to player property to fix bug
Merge branch 'UI' into dev
Merge pull request #40 from malucky/dev

Updated bugs with ready button and watchers not updating
commented out chat
refactored output and promises
add flatui
Merge branch 'flat' into devTemp

Conflicts:
	public/index.html
	public/views/main.html
fixed test comparisons
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
css issues
Merge pull request #45 from alexmckenley/dev

css issues
CSS