changes to some looks
Commit to stash
Merge branch 'master' into feature/pusher

Conflicts:
	app/views/layouts/application.html.erb
	app/views/rooms/index.html.erb
	app/views/rooms/show.html.erb
Merge pull request #19 from tidydee/feature/pusher

changes to some looks