Conflicts:
	ba_gaida/src/shaders/ba_gaida/arbitraryPositionShader.glsl
	ba_gaida/src/shaders/ba_gaida/normalShader.glsl
	doku/2014_EG_SPH_STAR.pdf
	doku/Quellen/2014_EG_SPH_STAR.pdf
	doku/cgBA_Latex/BA.aux
	doku/cgBA_Latex/BA.bbl
	doku/cgBA_Latex/BA.lof
	doku/cgBA_Latex/BA.log
	doku/cgBA_Latex/BA.out
	doku/cgBA_Latex/BA.pdf
	doku/cgBA_Latex/BA.synctex.gz
	doku/cgBA_Latex/BA.tex
	doku/cgBA_Latex/BA.toc
	doku/cgBA_Latex/Bilder/StoringLable.JPG
	doku/cgBA_Latex/lib.bib