Starting Rails 4 Upgrade
Merge branch 'rails4' of github.com:bastosmichael/rails-4-stripe-saas
Removing database.yml
Fixing Merge Conflict