In the process of adding support for NPC's
Merge branch 'master' of https://github.com/jvasilakes/farm-game

Conflicts:
	world.py

Started work on implementing NPC's