add_push
add gem annotate
Merge branch 'room' into add_pusher

Conflicts:
	Gemfile
	config/routes.rb
Merge branch 'add_pusher' of github.com:SBS-team/chaaat into add_pusher
Merge branch 'add_pusher' of github.com:SBS-team/chaaat into room

Conflicts:
	Gemfile
	config/routes.rb