Now with randomized NPC displaying
Merge branch 'master' of https://github.com/yannyu/factotum

Conflicts:
	index.html