Adds demo selectize form
Merge conflicts
Completes selectize implementation for adding trip users
Resolves conflict in Gemfile
pulls nav_bar into partial rendered only in application layout.
tiny merge conflicts in trips#show and .gitignore
cleans up navigation bar
can add tweet with only image
First - adds set_trip method to trips controller. Second - moves create trip button
clean up Create Trip button on trips#index
adds a push to feed layout
Merge pull request #82 from MarcGarreau/iron-out-wrinkle

Iron out wrinkles
Implements VCR and tests for login and trips
Deconflicts merge
Merge pull request #84 from MarcGarreau/selectize

Selectize
merge conflicts resolved