Added sword and armour game entity
Fixed merge
Merge branch 'master' of github.com:Senney/CPSC599-RPG

Conflicts:
	src/cpsc599/states/Level1/IntroLevelState.java