Player/Obstacle Collisions
Merge remote-tracking branch 'origin/master'

Conflicts:
	TopDown-TempleRun/Assets/Materials.meta
	TopDown-TempleRun/Assets/Prefabs.meta
	TopDown-TempleRun/Library/CurrentLayout.dwlt
	TopDown-TempleRun/Library/ScriptAssemblies/Assembly-CSharp.dll
	TopDown-TempleRun/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	TopDown-TempleRun/Library/assetDatabase3
	TopDown-TempleRun/Library/guidmapper
	TopDown-TempleRun/Library/metadata/34/346b45d456157cb44a687fd2d76d803e
	TopDown-TempleRun/Library/metadata/39/39eec2441c979d74da5876546e21753c