Added FactoryGirl to spec_helper file.
Merge remote-tracking branch 'origin/master'