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

Conflicts:
	app/js/controllers/home_controller.js
	app/pages/index.us
Merge branch 'master' of https://github.com/viperfx/hackchat