wow generating path :)
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Platform.prefab
	Assets/PlayerMovement.cs