Initial commit
Modified .gitignore to resolve the conflict
Changed extension and modified README file
Merge branch 'master' of github.com:alexander-hayden/first-rails-app