First level commit
Merge branch 'master' of https://github.com/rikproDVC/Gradius

Conflicts:
	Assets/Scenes/Scene1.unity