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
Remove reset_settings from global scope
Refactor options to use menu; Add options submenus
Chang option menu onSelect callback from anonymous function to method call
Option menu selection fix
Add database update to option leave function
Add Hardcore Mode to options
Remove RESET from start menu
Add hardcore mode to options init
ignores love 9 compaibility prompt