checked stash
added a travel route search
merging
temp must add back in first and last line of google maps API
stash
added first Jasmine test
delete some gems that are note used
removed file from migration
deleted twitter controller code
deleted twitter controller code
stash
Instagram latest
draft
merge
Merge remote-tracking branch 'ecomba/master'
working on insta
draft
changes made to stylesheets, addition of user session to make users name avaiable for creating a trip, some changes made to the .erb files to enable flow of forms to be more syntactially correct
working
merging conflicts