added random cats functionality
Merge branch 'tommy'

Conflicts:
	cat.py
Fix conflicts
Final fix
Minor tweak