changing testing fixtures to FactoryGirl objects
fixed merge error with factories/field.rb
dateanswer model unit tests pass