Change things
Merge branch 'master' of github.com:bbaumgar/circuits-with-friends into b-feature-branch
git commit -m "Move chat to chat.js, add css"
Merge remote-tracking branch 'origin/master' into b-feature-branch

Conflicts:
	public/js/workspace.js