Updated Gems
Commenting out admin before filter for now
Started tracking database.yml
Updated user spec
Resolved database.yml merge conflict
Resolved Gemfile and Gemfile.lock merge conflicts