removed database.yml from .gitignore
Merge branch 'master' of github.com:jackson-sandland/seat
bringing local branch up to date with master