chat working
Merge branch 'master' of https://github.com/mgonto/yo-martin

Conflicts:
	app.js
Merge branch 'master' of https://github.com/mgonto/yo-martin