gemfile.lock derp
fixed minor conflicts