some more greetings
trying to be faster than johanna

Merge remote branch 'origin/master'

Conflicts:
	README
Merge remote branch 'origin/master'