conflict resolved
Merge origin/master

Conflicts:
	src/main/java/mum/auction/controller/BookBean.java
	src/main/webapp/addBook.xhtml
Merge origin/master

Conflicts:
	src/main/java/mum/auction/controller/BookBean.java
	src/main/webapp/addBook.xhtml
resolving conflicts
Merge origin/master