abo wahrom?
Merge branch 'master' of https://github.com/NilsEdison/SBB-Ticketautomat

Conflicts:
	Keyboard_1.html
	SBB_Verbindung_1.html