just need to add specifics
adds vulnerabilities and damage types
Addresses #1660.

I'm not sure exactly how this happens, but this should stop the error
from causing a crash.
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
sandpits fix initial commit
fisrt sandpits done
sandpits2
Merge branch 'master' into valleyfix
WIP
Merge branch 'master' into valleyfix
redo tacotown
WIP
sandpits WIP
#1718 Initial refactor of controls.lua
#1718 Renamed buttons to actions for clarity
Merge branch 'master' into valleyfix