gravatar
fix add annoucements
submit chat on enter, keep focus on textbox
Merge branch 'master' into sections
remove conflict
move add user to bottom of page
dirty implementayion of logo click to home
Add sidebar icons
Merge branch 'sections' of github.com:rahij/cloaked-hipster into sections
Merge branch 'sections' of github.com:rahij/cloaked-hipster into sections

Conflicts:
	client/templates/chat.html
add timestamps to annoucements
added twitter and instagram feed
show people in room
Merge branch 'sections' of https://github.com/rahij/cloaked-hipster into sections
merged stuff
fix positioning of initial survey form
some ui stuff
Merge branch 'sections' of https://github.com/rahij/cloaked-hipster into sections
some ui stuff
some polishing