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

Conflicts:
	Assets/Resources/Levels/Prefabs/Powerup.prefab
	Assets/Resources/Player/Prefabs/PlayerFab.prefab
	Assets/Resources/PowerUps/Prefabs/PowerUp.prefab
	Gradius-csharp.sln
	Gradius.sln
Collision is working :D