resolved conflicts
Merge branch 'master' of https://github.com/lchsiao/LibraryProject304

Conflicts:
	Library/src/sql/LibrarySQLUtil.java