errorFix
Merge branch 'master' of https://github.com/TMDiary/BloggTenta2.git
Merge branch 'master' of https://github.com/TMDiary/BloggTenta2.git