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

Conflicts:
	Gradius-csharp.sln
	Gradius.sln
Merge branch 'master' of https://github.com/rikproDVC/Gradius

Conflicts:
	Assets/Resources/Enemies/Scripts/RegularEnemy.cs
	Gradius-csharp.sln
	Gradius.userprefs
Merge branch 'master' of https://github.com/rikproDVC/Gradius

Conflicts:
	Assets/Resources/Enemies/Scripts/RegularEnemy.cs
	Assets/Resources/Player/Scripts/Player.cs
	Assets/Scenes/Stage1.unity
	Gradius-csharp.sln
	Gradius.sln
	Gradius.userprefs