more merge issues
Merge pull request #42 from sbokaie/master

grids not perfect
Styling. Merge issues
Style merge conflcts
Background color style
717am
fix trips controller
Merge pull request #43 from MooreJesseB/master

Styling and bug fixes
shit
final