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
Ignore platforms that isn't current one
Properly ignore all cases of not current platform.
resolve conflict
add self. to variables
Merge remote-tracking branch 'upstream/master' into damage-types
The first few screens now only require 30mb, instead of 143mb.
Merge branch 'master' into fix_characters
Fix the character select screen and overworld.

These scenes no longer import all their resources when imported. That
happens now on enter.
Reentering a level from pause screen now works.
Merge pull request #1824 from hawkthorne/fix_pause_menu

Reentering a level from pause screen now works.
Starting a level works