Add Tankstelle
Merge branch 'master' of github.com:dasonntag/demo

Conflicts:
	test.txt