ignore database.yml and deploy.rb
Merge branch 'master' of github.com:tschuster/sports