Fix me!!!!!!
message.js to message.coffee
fix js
fix js part2
Merge branch 'fixedJSPart2' into change_topic

Conflicts:
	app/assets/javascripts/pusher.js
	app/assets/javascripts/rooms.js
	app/views/users/index.html.haml
	app/views/users/show.html.haml