有点错 但还是提交上了
Merge branch 'master' of github.com:xzjs/Library

Conflicts:
	DataBase.cpp
	YY.cpp
	YY.h
	library.sdf
	login.cpp
	login.h
	main.cpp