Added npcs & shit
Merge branch 'master' of https://github.com/YRSNorwich/Datamon

Conflicts:
	res/dumped_map_image.png