change
Merge branch 'master' of https://github.com/allen0125/bookshop

Conflicts:
	src/com/sx/entity/Reader.java
	src/com/sx/view/browseManage.java