Derp
Revert "Derp"

This reverts commit 5b71da54b6c364d2168c2f8671d93ddfff35d782.
Merge branch 'Edvard' of https://github.com/SmartShoppingTeam/SmartShopping into Edvard