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

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