Changed Shield to have child classes
trying to fix merging
Merge branch 'master' into Caleb_Branch

Conflicts:
	nbproject/private/private.properties
Merge pull request #6 from nkarusala/Caleb_Branch

Merging Caleb Branch to Master