added new material images
added new materials
first start on turkeys
Merge remote-tracking branch 'upstream/master' into jive-turkeys
Merge remote-tracking branch 'upstream/master' into jive-turkeys
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
continued
Merge remote-tracking branch 'upstream/master' into jive-turkeys

Conflicts:
	src/nodes/enemy.lua
jive
supports ducking
floor collision bug fixes
adds sliding underneath ceilings while escaping ducking
Merge branch 'master' into duck

Conflicts:
	src/nodes/floorspace.lua
	src/player.lua
reverted floorspace change
locks the player into his original ducking direction
fixed jumpkill bug

Conflicts:
	src/nodes/enemy.lua
work on turkey
Merge remote-tracking branch 'upstream/master' into jive-turkeys

Conflicts:
	src/nodes/enemy.lua