...
Merge branch 'master' of github.com:philko4711/Scrum_Master

Conflicts:
	praesentation/my_Presentation.tex