fixed new trip button
merge for map change
merge from master
merging from master
merging
home page
ugh
calendar hover
merge from master
merging maybe
temp
Merge pull request #92 from arieldiamond/UI-ariel

Ui ariel