delete links erb
add_search_style
add migrate
last update this branch
Add user_up
css change
Merge branch 'sign_up' into new_chat_dialog

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/messages.js
	app/assets/stylesheets/messages.css
	app/controllers/application_controller.rb
	app/controllers/message_controller.rb
	app/views/devise/passwords/new.html.erb
	app/views/layouts/application.html.haml
	app/views/message/_rooms.html.haml
	app/views/message/index.html.haml
	app/views/message/show.html.haml
	config/routes.rb