show-trip
begin waypoint stuffs
Merge branch 'master' of https://github.com/kaylalynjones/road-trip

Conflicts:
	app/static/js/user/show-trip.js