set up rails app
created user and trip migrations and models
edited gemfile
fixing unmerged files