testing heroku mongohq
testing heroku mongohq
Merge branch 'master' of heroku.com:vchat-demo

Conflicts:
	chat-server.js
Merge branch 'master' of heroku.com:vchat-demo

Conflicts:
	chat-server.js
Merge branch 'master' of heroku.com:vchat-demo

Conflicts:
	chat-server.js
Merge branch 'master' of heroku.com:vchat-demo

Conflicts:
	chat-server.js
Merge branch 'master' of heroku.com:vchat-demo