added new material images
added new materials
added simple recipes
removed unnecessary files
Merge branch 'master' into adding_new_materials

Conflicts:
	src/items/materials/leafItem.lua
	src/items/materials/rockItem.lua
	src/items/materials/stickItem.lua
	src/items/recipes.lua
Merge branch 'master' into adding_new_materials_merge

Conflicts:
	src/items/recipes.lua
Merge branch 'master' into adding_new_materials_merge
Merge branch 'master' into adding_new_materials

Conflicts:
	src/datastore.lua
updated large material images
readded the blacksmith as an activenpc
improve category selection border
removed torch, visually tweaked shopping gamestate, changed prices of materials
Merge branch 'master' into blacksmith_active_npc

Conflicts:
	src/level.lua
switch jump back to attack
add trombonist enemies to valley
change damamge and hp of trombonists
Merge pull request #984 from NimbusBP1729/adding_new_materials

Adding new materials
Merge pull request #1058 from didory123/trombonist

Add trombonist enemies to valley
Merge pull request #1030 from NimbusBP1729/blacksmith_active_npc

readded the blacksmith as an activenpc
removed attack skating changed troy's jump back to its original