Update FactoryGirl version in Gemfile.lock file.
Merge branch 'master' of github.com:CarlosPlusPlus/swoonatra