fix branch naming event
Merge branch 'master' of github.com:tujamaica/elementary-bugs-socket

Conflicts:
	dist/server.js
	src/server.coffee