forgot
Merge branch 'master' of github.com:hoany/diploma

Conflicts:
	Diplomarbeit_TGM_TGM/Diplomarbeit_KOPG_TGM.tex
Merge branch 'master' of github.com:hoany/diploma