Pushing up changes to level generation
Merge branch 'jason' of https://github.com/WakeskaterX/EvoDash into jason

Conflicts:
	Assets/Prefabs/player.prefab
	Assets/Prefabs/testPlatform.prefab
	Assets/Scripts/playerControl1.cs