edit
Merge branch 'master' of https://github.com/vongochung/cat

Conflicts:
	templates/home/kitten.html
Merge branch 'master' of https://github.com/vongochung/cat