Added code to make shield not work unless you have

shield in shield spot in inventory.
Merging stuff
Merge branch 'master' of github.com:Bacon41/PantheonPrototype

Conflicts:
	PantheonPrototype/PantheonPrototype/Entities/Characters/PlayerCharacter.cs
Still trying to work out merge conflicts...