MovingPlatforms
Merge remote-tracking branch 'origin/master'

Conflicts:
	New Unity Project/Assembly-CSharp-vs.csproj
	New Unity Project/Assets/Scen 1.unity
	New Unity Project/Library/CurrentLayout.dwlt
	New Unity Project/Library/InspectorExpandedItems.asset
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	New Unity Project/Library/assetDatabase3
	New Unity Project/Library/expandedItems
	New Unity Project/Library/guidmapper
	New Unity Project/Library/metadata/0a/0af7f3088a6d0f0479907fc1f2ad1ed3
	New Unity Project/Library/metadata/5b/5b135dc382e72e647893855e70783134
	New Unity Project/Library/metadata/5f/5fa5692f27696274db9ff2e08d0e1060
	New Unity Project/Library/metadata/72/72efe83270d4efc4e86babd74d3cf012
	New Unity Project/Library/metadata/d8/d8a413bf16c74454b89c896faf3de29c
	New Unity Project/New Unity Project-csharp.sln
	New Unity Project/New Unity Project.sln
	New Unity Project/New Unity Project.userprefs