no
Merge branch 'frontend' of https://github.com/zrathustra/kittygram into frontend

Conflicts:
	templates/index.html
no
Merge branch 'frontend' of https://github.com/zrathustra/kittygram into frontend

Conflicts:
	templates/index.html
The best and the brightest