...
...
Merge remote-tracking branch 'upstream/master'
懒得写了。
	modified:   DiaryManager/DiaryManager.csproj
	modified:   DiaryManager/frmCreateNewDiary.cs
	modified:   DiaryManager/frmMain.Designer.cs
	modified:   DiaryManager/frmMain.cs
	renamed:    DiaryManager/frmNewDiary.resx -> DiaryManager/frmMain.resx
	deleted:    DiaryManager/frmNewDiary.cs
	deleted:    DiaryManager/frmNewDiary.designer.cs
Merge pull request #18 from zsf222/master

懒得写了。