Tweaking Character stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	UntitledRPG/UntitledRPG.userprefs
Sometimes, I hate Git
Merge remote-tracking branch 'origin/master'

Conflicts:
	UntitledRPG/UntitledRPG.userprefs