Removed some copied code, move the name entry
Merge branch 'master' of https://github.com/jdlewis92/EWU-Design-Patterns

Conflicts:
	as6/DungeonCharacter.java
	as6/Sorceress.java
	as6/Warrior.java