Update to obstacle spawn and type 3
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scripts/Managers/PlayerManager.cs