modified:   DiaryManager/Form1.Designer.cs
Merge remote-tracking branch 'upstream/master'
修改了菜单栏和一些细节。
	modified:   DiaryManager/Form1.Designer.cs
	modified:   DiaryManager/Form1.cs
Merge pull request #16 from zsf222/master

修改了一些细节。