databaae.yml for travis-ci
Merge branch 'dev' of https://github.com/sixandfo/cafe into dev