a1
Merge branch 'master' of https://github.com/stefanklingner/gitschulung

Conflicts:
	README.md