untrack database.yml
basic tests
Merge branch 'test' into develop