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
add self. to variables
Merge remote-tracking branch 'upstream/master' into damage-types
changed the method of adding vulnerablities and weapon bonus damage
Merge remote-tracking branch 'upstream/master' into damage-types

Conflicts:
	src/nodes/enemy.lua

merge upstream and fix missed change in wipe.lua
removes duplicated lines in inventory.lua
Merge remote-tracking branch 'upstream/master' into damage-types

Conflicts:
	src/nodes/enemies/turkeyBoss.lua

merge upstream
removes pop up health bar
move valley images
move hidden door images
more image clean up
combine info and note nodes
Merge pull request #1848 from edisonout/info-note-merge

Combines info and note nodes
Merge pull request #1845 from edisonout/image-move

Sorting out images folders