Changes made by Yoanna Mareva (jo.thirdeyevision@gmail.com).
Changes made by Yoanna Mareva (jo.thirdeyevision@gmail.com).
Merge branch 'master' of https://github.com/Wooanna/TripTrackerApplication.git

Conflicts:
	Trip Tracker/views/tripsToWatch.html