Merge pull request #2 from vonclites/connor

Connor
Merge pull request #3 from vonclites/connor

Added origin to character creation
General code cleanup and refactoring