Added Capybara test suite.
Added Factory Girl to the test suite.
Created Capybara tests for user sign up and user sign in for use with Devise.
resolving merge conflict in Gemfile.lock by running bundle