Trying to fix shield Upgrades
Conflict Fix

Conflicts:
	Assets/Code/Wrahh.cs
Uploading