Tanken + Bezahlen
Merge branch 'Telletubbies' of https://github.com/Lextum/Tanken.git into
Telletubbies

Conflicts:
	TankenNeu/src/Tanksaeule.java