more sexy csss
Merge branch 'master' into layout/more-css

Conflicts:
	app/views/rooms/show.html.erb
Merge pull request #33 from tidydee/layout/more-css

more sexy csss