fixed trip planner
Merge remote-tracking branch 'origin/master'

Conflicts:
	lab10/application/views/tripresult.php