hahahasfsadfsdg

dsfgdsfgsdfgdsfg
service
swag

gucci
werkend
order
begin met afrekenen
stond op create drop
Editing log
Making customer reset
Merge hub/master

Conflicts:
	src/main/java/com/controller/LogController.java
	src/main/java/commons/LoggableList.java
Fixed merge errors
Merge hub/OrderCart

Conflicts:
	src/main/java/com/model/CartItem.java
	src/main/webapp/WEB-INF/jsp/shop/cart.jsp