ä1
a2
Merge branch 'master' of https://github.com/wpetrov/test

Conflicts:
	Neues Textdokument.txt

Signed-off-by: Wilhelm Petrov <wpetrov@toygardens.com>
m2