Merge pull request #1 from againcy/master

1.1
Diaryclass
Merge pull request #6 from SunHao1993/master

diary class
Merge pull request #5 from againcy/update

Update