changed database.yml
fixed gemfile conflicts
Merge pull request #7 from s-loar/Lienha

fixed gemfile conflicts