just need to add specifics
adds vulnerabilities and damage types
removes blade type adds slash/stab
removes blade from nodes
Merge remote-tracking branch 'origin' into specific-weapons

Conflicts:
	src/nodes/enemies/guitarist.lua
	src/nodes/enemies/spider.lua
	src/nodes/enemies/trombonist.lua
	src/nodes/enemies/violinist.lua

merge master
Merge remote-tracking branch 'upstream/master' into specific-weapons

Conflicts:
	src/nodes/projectiles/basketball.lua
	src/nodes/projectiles/computer.lua

projectile merge master
include crimson sword
random duck jump
Platform properly ignores top_bb
This should fix the misplaced tiles
new recipes, new prices. Add materials and recipes scattered through out the game
Add potion directions in lab
Merge pull request #1789 from 8bitgentleman/forestcave-tilefix

Forestcave - Tilefix
fix note in lab to be shorter
Add in hacks for CommuniCon
Merge branch 'master' of github.com:hawkthorne/hawkthorne-journey
fix recipes as per bucket's suggestion
add cauldron in tacotown
remove cauldron because it doesn't work
fix typo in recipe