Fixing the merge again
Yrrrr
Still working on it
Merge branch 'master' of https://github.com/Sdonai/BaconJam05

Conflicts:
	.gitignore
	Animations/PersonPrototype3/Default/000.png
	Event sheets/Creature Events.uistate.xml
	Event sheets/Creature Events.xml
	Event sheets/Event sheet 1.xml
	Event sheets/Ghost.xml
	Event sheets/Goblin.uistate.xml
	Event sheets/Goblin.xml
	Event sheets/PeopleEvents.xml
	Event sheets/Zombie.xml
	Layouts/Layout 1.uistate.xml
	Layouts/Layout 1.xml
	Pathfinding demo.caproj
	Pathfinding demo.capx.backup1