uses FactoryGirl helpers
Merge pull request #176 from fsmanuel/master

uses FactoryGirl helpers