committing some stuff
Merge branch 'master' of https://github.com/tonocm/HackerChat

Conflicts:
	app.js