Fixed Added configuration
Merge branch 'master' of https://github.com/sjmoon0/learn-rails

Deleted config/application.yml~ from git repository because it contained
personal info. Now a merge is necessary in order to push again.