chat layout etc
Merge branch 'master' into layout/clean-up

Conflicts:
	app/assets/stylesheets/rooms.css.scss
	app/views/rooms/show.html.erb
Merge pull request #24 from tidydee/layout/clean-up

chat layout etc