New townsperson

This is an update to the npc in the village called townsperson. It
includes adding affection system to the townsperson. Also it adds more
commands, and a quest the user can do to gain affection from the
townsperson, in which you must collect sticks for him.
Merge branch 'master' of https://github.com/nickbuckwalter/hawkthorne-journey

Conflicts:
	src/images/npc/townsperson.png
	src/npcs/townsperson.lua