fixed chairs in deans-office
prevents game from crashing when you exit a level while picking something up.
fixes #1202
change hp for trombonist and acorn
more weapons changes: add throwingaxe, boneclub, add bone materials to valley, add some more materials
add ember material to black caverns, change throwingaxe speed
add items to blacksmith shop
bats drop coins instead of 1ups now
bats drop more coins
Fixes befine Annie
throwingaxe flies lower now
Merge pull request #1208 from didory123/acornhp

change hp for trombonist and acorn
Merge pull request #1213 from didory123/throwingweapons

New materials/weapons
Merge pull request #1214 from didory123/1ups

bats drop coins instead of 1ups now
Merge pull request #1203 from prene7/greendale-admin

fixed chairs in deans-office
Merge pull request #1220 from DaNiwa/befine

Fixes befine Annie
Merge pull request #1206 from NimbusBP1729/fix_baseball_exit_bug

prevents game from crashing when you exit a level while picking somethin...
Merge branch 'master' into mountains

Conflicts:
	src/maps/black-caverns-2.tmx
	src/maps/black-caverns.tmx