换netbeans.完成几个读取函数
Merge branch 'server' of https://github.com/slixurd/tNotes into server

Conflicts:
	tNotesServer/nbproject/Makefile-Debug.mk
	tNotesServer/nbproject/Makefile-Release.mk
合并