Signed-off-by: Robin Gabre <robijoha@student.chalmers.se>
Merge branch 'master' of https://github.com/Legogris/dat215

Conflicts:
	iMat/UI.Desktop/Content/ShoppingCart.xaml

Signed-off-by: Robin Gabre <robijoha@student.chalmers.se>
Merge branch 'master' of https://github.com/Legogris/dat215

Conflicts:
	iMat/UI.Desktop/Content/ShoppingCart.xaml
	iMat/UI.Desktop/Resources/Icons/checkoutButton.png
Merge branch 'master' of https://github.com/Legogris/dat215

Conflicts:
	iMat/UI.Desktop/Content/ShoppingCart.xaml
Bara andrat mainwindow.xaml