Merge branch 'master' of heroku.com:videochat

Conflicts:
	src/server/index.js