Trying to commit uncommitted files
Merge branch 'master' of https://github.com/drkangl90/DungeonAndDragons