readme foo
Merge branch 'master' of https://github.com/Ungeheuer/nm-setup-workshop-player

Conflicts:
	README.md