conflicts
Merge branch 'master' of https://github.com/irie-pepe/nicename
Merge branch 'master' of https://github.com/irie-pepe/nicename

Conflicts:
	Eine Geschichte.txt