.
Merge branch 'master' of https://github.com/bboecherer/SailingSchoolManagerWPF

Conflicts:
	SealingSchoolManagerWPF.v12.suo
Merge branch 'master' of https://github.com/bboecherer/SailingSchoolManagerWPF
Anpassung Beispieldaten.sql
Merge branch 'master' of https://github.com/bboecherer/SailingSchoolManagerWPF
Merge branch 'master' of https://github.com/bboecherer/SailingSchoolManagerWPF
Beispieldaten und Ablauf und Punkte Endpräsi Stefan.docx