Add search
delete links erb
split branch
aplication add pusher
delete links erb
pusher auth add
application.js - add EnterKey message sending, and add styles with <br>
Merge github.com:SBS-team/chaaat into pusher_auth

Conflicts:
	Gemfile
	Gemfile.lock
	README.md
	app/assets/javascripts/application.js
	app/controllers/application_controller.rb
	app/models/user.rb
	app/views/devise/passwords/new.html.erb
	app/views/devise/registrations/edit.html.haml
	app/views/devise/registrations/new.html.haml
	app/views/devise/sessions/new.html.erb
	app/views/devise/shared/_links.html.haml
	app/views/layouts/_messages.html.haml
	app/views/layouts/_navigation.html.haml
	app/views/layouts/application.html.haml
	config/initializers/devise.rb
	config/routes.rb
	db/schema.rb
add_search_style
add migrate
prealfa version 0.1403
Conflicts:
	Gemfile
	README.md
	app/assets/javascripts/application.js
	app/controllers/application_controller.rb
	app/controllers/message_controller.rb
	app/controllers/users/omniauth_callbacks_controller.rb
	app/models/message.rb
	app/models/room.rb
	app/models/rooms_user.rb
	app/models/user.rb
	app/views/devise/passwords/new.html.erb
	app/views/devise/sessions/new.html.erb
	app/views/devise/shared/_links.html.haml
	app/views/layouts/_navigation_links.html.haml
	app/views/layouts/application.html.haml
	app/views/message/index.html.haml
	config/initializers/omniauth.rb
	config/routes.rb
	erd.png
	spec/factories/messages.rb
	spec/factories/rooms.rb
	spec/factories/rooms_users.rb
	spec/models/message_spec.rb
	spec/models/room_spec.rb
	spec/models/rooms_user_spec.rb
update readme.md
last update this branch
Add user_up
new chat dialog
css change
Add message sound
Merge branch 'master' into develop
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
add avatar and media links
Merge branch 'rooms_users_ajax' into add_avatar

Conflicts:
	Gemfile
	Gemfile.lock
	README.md
	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/controllers/users_controller.rb
	app/helpers/message_helper.rb
	app/models/rooms_user.rb
	app/models/user.rb
	app/views/layouts/_navigation.html.haml
	app/views/layouts/_navigation_links.html.haml
	app/views/layouts/application.html.haml
	app/views/message/index.html.haml
	app/views/message/show.html.haml
	config/routes.rb
	db/migrate/20140314150603_add_login_to_user.rb
	db/schema.rb
	spec/factories/users.rb
	spec/models/user_spec.rb