Merge pull request #2 from raytung/devise

Devise
Update database.yml
Merge pull request #3 from raytung/devise

changed structured. Added more tests
merged