modified features, modified gemfile
same as before
successful merge
implemented edit feature/test