Creating Moving Platforms
Merge remote-tracking branch 'origin/master'

Conflicts:
	Game/Assembly-UnityScript-Editor-vs.unityproj
	Game/Assembly-UnityScript-Editor.unityproj
	Game/Assembly-UnityScript-vs.unityproj
	Game/Assembly-UnityScript.unityproj
	Game/Game.userprefs