merge bugs
diary edit
remove useless file
fix bugs
Merge pull request #10 from huahuajiujiu/master

edit diary