Merge branch 'LaTeX_documentation_holzi'
Meeting final
Merge branch 'LaTeX_documentation_holzi'
Merge branch 'master' into latex_doc_felix
Removed TODO
Rechtschreibung
Merge branch 'LaTeX_documentation_holzi'
Merge branch 'latex_doc_felix'

Conflicts:
	doc/LaTeX/IS_Projekt.bbl
	doc/LaTeX/IS_Projekt.blg
.gitignore
Merge branch 'master' into LaTeX_documentation_holzi