Wandering Bunny
Merge branch 'master' of https://github.com/Sdonai/BaconJam05

Conflicts:
	Layouts/Layout 1.xml
Updating ignores

Signed-off-by: Marcus Silva <silentstrum@gmail.com>
Merge branch 'master' of https://github.com/Sdonai/BaconJam05

Conflicts:
	Layouts/Layout 1.xml
	Pathfinding demo.capx.backup1