merge error
Merge branch 'master' of https://github.com/spasiu/codename-ekonomik

Needed merge due to commit order error
fix syntax error list_items and thumb_items
Merge branch 'master' of https://github.com/spasiu/codename-ekonomik

simultaneous edits to routes file
add userItems as elephants
Merge branch 'master' of https://github.com/spasiu/codename-ekonomik

merge due to routes file concurrent changes
pass conString to Items repo