Messy, quick way to get things working...

Whoops
Merge branch 'master' of github.com:mrienstra/barchat

Conflicts:
	src/script/app.jsx