Got info and connect to work
Merge branch 'master' of https://github.com/sunniejai/black-sesame

Conflicts:
	app/server/app.js
	server.js