JS
Merge branch 'master' of https://github.com/NilsEdison/SBB-Ticketautomat

Conflicts:
	ticket_1.html
Merge branch 'master' of https://github.com/NilsEdison/SBB-Ticketautomat