First Commit
Modified savepoints and timing
Merge branch 'master' into autosave

Conflicts:
	src/hud.lua
	src/maps/town.tmx
	src/maps/valley-tacotown.tmx
Merge branch 'master' into autosave

Conflicts:
	src/maps/studyroom.tmx
Blacksmith reacts to stolen torch and is killable
Adds Stolen torch weapon
torch header fixes
re-attempt stolen_torch item icon
Adds npc support to check players inventory for items
remove npc.angry as a part of checkInventory
U.N. Protest and Ham costumes for Britta.
4 more Jeff + 1 more Abed costume
Start adding throwingtorch
Merge pull request #1977 from reddfawks/hammygoodness

U.N. Protest and Ham costumes for Britta.
Removes npc clutter
Merge pull request #1985 from DaNiwa/npcbox

Removes npc clutter
Fix music switching bug
Merge pull request #1986 from DaNiwa/mainmusic

Fix music switching bug
reduce image size of blocks & consumables
annie, abed, britta costume reduce