WIP: add cat
added a non-agressive cat enemy
fixed weapon freezing bug
added monkey
Merge branch 'master' into cat

Conflicts:
	src/maps/forest-2.tmx
	src/maps/forest.tmx
	src/maps/village-forest.tmx
Fixes tween dt = 0 error

Error: vendor/tween.lua:360: dt must be a positive number
Merge pull request #952 from jhoff/tween_fix

Fixes tween dt = 0 error
Merge pull request #947 from NimbusBP1729/weapon_redundancy

fixed weapon freezing bug
Merge pull request #949 from NimbusBP1729/cat

Cats
allows fish to survive water
Merge pull request #956 from NimbusBP1729/fish_cant_drown

allows fish to survive water