datatbase
Update database.yml
Update Conn_model.rb
database
db
Update database.yml
Update database.yml
Merge branch 'database'