no ignore database
Merge branch 'master' of github.com:qwaszx102938/railsFirstApp
no ignore db