Added ship types and shield pickup
Merge branch 'master' of https://github.com/kevinmcree/My-Fair-Lady-2

Conflicts:
	Assets/Main Game.unity