some stuff
Merge branch 'master' of github.com:fxjung/phyprak

Conflicts:
	0_Shared/Literatur.bib