preparing for deploying, added database.yml in gitignore, deleted
database.yml
Merge branch 'master' of https://github.com/thlias/angular-rails-template