Merge branch 'master' of E:\My Documents\GitHub\CharacterSheet with conflicts.