simple view changes
Merge branch 'master' into feature/view-fix

Conflicts:
	app/views/rooms/show.html.erb
	app/views/users/index.html.erb
Merge pull request #13 from tidydee/feature/view-fix

simple view changes