chat changes
Merge branch 'master' of https://github.com/viperfx/hackchat

Conflicts:
	app/templates/home.html