:>
Merge branch 'master' of https://github.com/xpush/stalk.io

Conflicts:
	controllers/chat.js