update bibliography
Merge branch 'master' of github.com:gregorburger/bibliography

Conflicts:
	master.bib