Heading home
bla
remove conflicts
fix show item
Merge branch 'master' into add_devies

Master branch corrupted. Using add_devies as master
Add carousel to shop/items page