added xib so we can move faster through tripviewcontroller
Merge remote-tracking branch 'origin/master'
Recommit the button
Merge remote-tracking branch 'origin/master'