lots of changes on thursday week1
Merge branch 'master' of https://github.com/horngep/Shelf