rm database.yml from git
change db/schema.rb
Merge branch 'dev' of https://github.com/victorgong/intime into dev