några buggar
Merge branch 'master' of https://github.com/Qualmeru/WebShop.git