fffffffffffffffffff
Merge branch 'master' of https://github.com/mstusek/gitschulung
fffffffffffffffffffMerge branch 'master' of https://github.com/mstusek/gitschulung

Conflicts:
	license.txt
ffffffffffffffffffffffffffffffffffffffffff
Merge branch 'master' of https://github.com/mstusek/gitschulung

Conflicts:
	license.txt
Merge branch 'master' of https://github.com/mstusek/gitschulung