more merge issues
Styling. Merge issues
Style merge conflcts
Background color style
fix trips controller
Merge pull request #43 from MooreJesseB/master

Styling and bug fixes