Convert to minimal bibtex
Merge branch 'master' of github.com:jona-sassenhagen/phijona---gamma

Conflicts:
	poster.bib