cats
cats
Merge branch 'master' of https://github.com/sdjidjev/RateMyCat

Conflicts:
	templates/ratemycat.html
Merge branch 'master' of https://github.com/sdjidjev/RateMyCat