work on paper
Merge branch 'master' of https://github.com/floAr/ADG_Scarlet_Gamma merge fixes with alternative conclusion.tex

Conflicts:
	docs/Paper/chapters/conclusion.tex