Update
Merge branch 'master' of https://github.com/rikproDVC/Gradius

Conflicts:
	Assets/Resources/Player/Prefabs/PlayerFab.prefab
	Gradius.userprefs