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

Conflicts:
	Assets/Resources/Enemies/Prefabs/RegularEnemyFab.prefab
	Assets/Resources/Player/Prefabs/PlayerFab.prefab
	Assets/Resources/Weapons/Prefabs/BulletFab.prefab
	Assets/Scenes/Stage1.unity
	Gradius.userprefs