re re push
Reset repository.
Reset & rebased on jreale branch.
Merge branch 'master' of git@github.com:Larke12/Team_Assignment-RPG.git

Conflicts:
	RPGModelClasses/src/com/jreale4/RPG/shared/Hero.java