database.yml test
database ymlのテスト
finish 4
finish 5
fix conflicts
Merge branch 'master' of https://github.com/t4traw/t4rsample