Fix test
Merge branch 'master' of github.com:kumabotz/pop

gem 'factory_girl_rails'