Cats now 'swim' midair at different heights
Merge branch 'master' into catsrabbits

Conflicts:
	minimap.png
Now prevents health from exceeding maximum HP
Merge branch 'catsrabbits'

Conflicts:
	minimap.png