modified:   DiaryManager/frmLogin.Designer.cs
	modified:   DiaryManager/frmLogin.cs
Merge pull request #17 from zsf222/master

	modified:   DiaryManager/frmLogin.Designer.cs