test 2
Merge branch 'master' of https://github.com/timaebersold/Raspberry

Conflicts:
	README Kopie.md