scanning game
Merge branch 'master' of https://github.com/TwistedOakStudios/TOJam8

Conflicts:
	UnityProject/Assembly-CSharp-firstpass.pidb
	UnityProject/Assembly-CSharp.pidb
	UnityProject/Assets/_Scenes/EpisodeTestScene.unity
	UnityProject/Assets/_Scenes/LocationScanner.unity
	UnityProject/UnityProject.userprefs