merged
Merge branch 'master' of github.com:bonnie-e/bib-web-2