blergh
Merge branch 'master' of https://github.com/JayArmstrongGames/Camp-Fire-Journeys

Conflicts:
	Assets/Spine/OldMan.json
	Assets/Spine/imp.json