Merge branch 'master' of https://github.com/blackwolf12333/GriefLog