I set up the project skeleton
Merge origin/master

Conflicts:
	src/main/java/waa/onlineshopping/dao/CartDao.java
Merge origin/master
I included new class
I included new class
Merge origin/master
I included customerRegistration page