merge into connect.hbs
Merge branch 'master' of https://github.com/sunniejai/black-sesame

Conflicts:
	Server/public/javascripts/views/ConnectView.js