proposal zeitplan
weekly presentation
Merge remote-tracking branch 'origin/master'

Conflicts:
	doc/Proposal.docx
removed F again