Add FactoryGirl to Gemfile
Use correct factory girl gem -______-
First property test passes, with Timecop added to Gemfile YEAHHHH
Change status_controller spec to use factory instead of hard create
Resolve merge conflicts