finished edit char screen, rip screen (triggered by load game)
Merge remote-tracking branch 'origin/master'