adds torch to blacksmith
Can pick up torches in blacksmith shop
Merge remote-tracking branch 'upstream/master' into blacksmith-torch
Add menu color parameter to NPC
Merge pull request #1942 from Nicko21/talk_color

Configurable NPC menu color
Add flag to disable talking
Merge pull request #1943 from Nicko21/busy_npcs

Allow NPCs to be "busy"
fix platform in borchert hallway
fix watermelon file
increase health token value
Merge pull request #1937 from CalebJohn/blacksmith-torch

Blacksmith torch
Merge pull request #1945 from edisonout/borchet-fix

Fix platform in borchert hallway
lock doors in tacotown
Merge pull request #1946 from edisonout/watermelon

Fix watermelon file
Merge pull request #1947 from edisonout/health

Increase health token value
Merge pull request #1948 from edisonout/valley_doors

Lock doors in tacotown
Stray Pixel fix