uploading items
Merge branch 'dev' of github.com:patschreiber/nori.nu into dev