setups capistrano suka blya
setups
merge
merge
changed deploy setups
delete duplicate gems from gemfile
fix emojify
delete schema
merge
delete conflict

Conflicts:
	app/assets/javascripts/messages.js
	app/views/layouts/_index.html.haml
fix add to room
Merge branch 'develop' of github.com:SBS-team/chaaat into develop
fix git ignore
merge
Merge branch 'develop' of github.com:SBS-team/chaaat into develop
devise token
typo fix
fix assets
fix assets
fix assets p2