fixed up moving platforms
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/Level2.unity