corrections
Merge branch 'master' of github.com:benadler/literature

Conflicts:
	literature.bib