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
Start adding throwingtorch
Merge branch 'master' into autosave
Saving no longer refills health
Clean the autosave warning
Remove Comments
Save only on contact with savepoint
Only save at checkepoint once per level instance
remove easy savepoints
Reset player on death
Add autosave property to map