rename checkout controller to payment controller to resolve the confict of reception checkout page
Merge branch 'origin/master'

Conflicts:
	WebContent/WEB-INF/web.xml
	src/controller/PaymentController.java
added serch result page form validation
added extra bed to hotel room database
user can add extra bed to the room
added email input
customer can booking the room.
nextmilestone: create filter to do the url matching for booking
don't need to write filter, need to place '/' in front of the jsp file, so that java knows it is root directory
create booking will create booking rooms entries
now can delete rooms
implemented mail sender functionality
solve the error of reverting
Merge branch 'origin/master'

Conflicts:
	WebContent/WEB-INF/web.xml
	WebContent/customer.jsp
	src/model/Booking.java
	src/model/BookingList.java
	src/model/RoomManager.java
Merge branch 'origin/ReceptionManager'
solve merge issue with reception manager
ingore files
remove .classpath file
ignore classpath
delete all .class files
Merge branch 'origin/Consumer'

Conflicts:
	.classpath
	.gitignore