emit 2
Merge remote-tracking branch 'origin'

Conflicts:
	app/views/chats/index.html.haml
	log/development.log
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/88d619ecb1068dbdbe8eba7c0056e44c
	tmp/cache/assets/development/sprockets/8ab512c9b33ac90e699b73469d71f061
	tmp/cache/assets/development/sprockets/bcca522c6302f184f12fe0e8a7d7e71a
	tmp/cache/assets/development/sprockets/c13fc73ceafa45876a901b3e775b83ae
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/development/sprockets/f81ef22356076e422f5227369b10fa60
	tmp/cache/assets/development/sprockets/fa6b53e34e4abad5deba3f8a4b016f50
	tmp/pids/server.pid
asds
Merge remote-tracking branch 'origin'

Conflicts:
	app/views/chats/index.html.haml
	log/development.log
	node/server.js
	tmp/pids/server.pid
afsd