where from?
Merge branch 'authors-and-reading'
Merge branch 'master' of /home/rogera/proj/inst