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

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