modi
merge, ready
big improvement in messaging
modi
Merge branch 'master' of heroku.com:fierce-atoll-3696

Conflicts:
	app/views/message/_form.html.erb
conversation show
conversation
modi
Merge branch 'master' of heroku.com:fierce-atoll-3696

Conflicts:
	app/views/conversations/index.html.erb