2nd commit
Merge branch 'master' of github.com:huangshangjia/First

Conflicts:
	NoteManage/src/action/FirstAction.java