conversation reply spec
add timeago
saca el boton de logout
Merge branch 'master' of github.com:redmintlabs/hackaton-bootstrap
add reply message
Merge branch 'master' of github.com:redmintlabs/hackaton-bootstrap

Conflicts:
	app/views/conversations/_conversation.html.haml
Merge remote-tracking branch 'origin/conversation_upload'

Conflicts:
	app/assets/javascripts/application.js
	app/controllers/conversations_controller.rb
	app/models/conversation.rb
	app/views/conversations/show.html.haml
	config/routes.rb
	db/schema.rb
remove stackmint