Added FactoryGirl, fixed factories.rb + user_controller_spec.rb