travisのテストを通るように修正
Merge branch 'feature-database' of github.com:okayamarb/pheasant into feature-database