Spike and platform changes
Final Scene
Merge remote-tracking branch 'origin/master'

Conflicts:
	asympleplatformer/Assets/prefabs/Spikes.prefab
	asympleplatformer/Assets/prefabs/platform.prefab
	asympleplatformer/asympleplatformer.userprefs