Tried fixing trips issue, Sam beat me to it
Merge branch 'master' of https://github.com/serich6/cycleatlantacapstone

Conflicts:
	index.php