asd
Merge branch 'master' of https://github.com/JoHae/htwg.seapal.akjjjh
asd
dddd
dd
sad
asd
Merge branch 'master' of https://github.com/JoHae/htwg.seapal.akjjjh

Conflicts:
	app/trip.html