sdf
Merge branch 'master' of https://github.com/Krachbum/schulung.git

Conflicts:
	kurs.data/.classpath
initial commit
Merge branch 'master' of https://github.com/Krachbum/schulung.git