update from bering
Merge branch 'master' of github.com:njwilson23/bibtex_database