first commit
changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/booking/CfgbgBookingServlet.java
	src/booking/LoginFilter.java
	src/booking/RegisterUserServlet.java
	src/booking/storage/DataStoreWrapper.java
	src/booking/users/CfGbgUser.java
	src/booking/users/MemberShip.java
	war/WEB-INF/web.xml
	war/app/registeruser.jsp
	war/app/showuserinfo.jsp
	war/app/usernotfound.jsp
	war/stylesheets/main.css