Some time scale and some work on puking systems
Merge branch 'master' of https://github.com/tehr0b/FratQuest

Conflicts:
	FratQuest.inform/Source/story.ni