updata
Merge branch 'master' of github.com:Gadao/diary