this is the work on displayTripInfo as far as it is right now
Merge branch 'master' of https://github.com/hugoleandersson/TravelMatch

Conflicts:
	partials/tripEvent.html - because apparently SourceTree thinks that it's fun to make some made up conflicts