comment move from left to right
comment from template element
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/assets/stylesheets/rooms.css.scss
	app/controllers/rooms_controller.rb
	app/views/rooms/show.html.erb
	config/routes.rb
add pusher-api and mb views
Merge pull request #2 from kshmd/master

add Pusher feature