Commit in order to merge. It won't let me merge without the commit.
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/creature/Ability_Score.class
	bin/creature/Creature.class