twitter alive
Merge branch 'master' of https://github.com/karanbirrandhawa/wizkat

Conflicts:
	templates/messages.html
route