Merge branch 'master' of heroku.com:pacific-reaches-2403

Conflicts:
.gitignore
Gemfile
Gemfile.lock
Rakefile
app/assets/javascripts/application.js
app/assets/stylesheets/application.css.scss
app/controllers/application_controller.rb
app/helpers/application_helper.rb
app/models/user.rb
app/views/layouts/_footer.html.erb
app/views/layouts/application.html.erb
config.ru
config/application.rb
config/database.yml
config/environment.rb
config/environments/development.rb
config/environments/production.rb
config/environments/test.rb
config/initializers/devise.rb
config/initializers/secret_token.rb
config/initializers/session_store.rb
config/routes.rb
db/schema.rb
db/seeds.rb
public/robots.txt
Revert "Merge branch 'master' of heroku.com:pacific-reaches-2403"

This reverts commit 56a508ebd4437df806bfd4026a635c247e09dbe8.
Revert "Commit again"

This reverts commit c2179452bd3b01756b0e8a8db53f921a5a5d7cd0.
Added Ruby Gem