IT WORKS!

As in, it runs.
Merge remote-tracking branch 'origin/master'

Conflicts:
	RPG/src/main/PlayerCharacter.java