Generators
Merge branch 'master' of github.com:tnc-ba/doku

Conflicts:
	bibliography.bib