worked on specs and factories
fixed merge conflict
organized Gemfile
fixed merge conflict