JLP --> ta bort min code
Merge branch 'master' of https://github.com/Florry/webshopProject.git

Conflicts:
	src/se/jiv/webshop/repository/dao/ShoppingCartDAO.java