maybe a little broken
Merge remote-tracking branch 'origin/master'

Conflicts:
	TopDown-TempleRun/Assets/Scenes/Main.unity
	TopDown-TempleRun/Assets/Scripts/Managers/ObstacleManager.cs
	TopDown-TempleRun/Assets/Scripts/Obstacles/ObstacleCache.cs
	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/expandedItems
	TopDown-TempleRun/Library/guidmapper
	TopDown-TempleRun/Library/metadata/39/39eec2441c979d74da5876546e21753c
	TopDown-TempleRun/Library/metadata/61/61713dc28598e41418ddc3ce93803c93
	TopDown-TempleRun/Library/metadata/6b/6b456a3b1d16d6345a1a7fc6022f2a28
	TopDown-TempleRun/Library/metadata/fe/fee0e8a67849338499f9ba085b551509
	TopDown-TempleRun/TopDown-TempleRun-csharp.v12.suo