Adding random cats
Fixed http errors
Merge branch 'tommy'

Conflicts:
	cat.py