1.Teil Fegerl
Merge branch 'master' of github.com:hoany/diploma

Conflicts:
	Diplomarbeit_TGM_TGM/tex/chapter2.tex
	Diplomarbeit_TGM_TGM/tex/chapter3.tex