shit
double shit
Revert "LESS THAN FOUR HOURS LEFT?"

This reverts commit 43160fdcc02c1284bb6dae25656fdc2e84f52581.

Conflicts:
	Merchant Concept/hero.lua
	Merchant Concept/menu.lua
	Merchant Concept/state.lua
submission
Merge branch 'master' of https://github.com/matthewdpace/LD31