add..
Merge branch 'master' of https://github.com/mstusek/gitschulung
merge
Merge branch 'master' of https://github.com/mstusek/gitschulung

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

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

Conflicts:
	README.md
Merge branch 'master' of https://github.com/mstusek/gitschulung

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

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

Conflicts:
	license.txt