issue#15
renamed database.yml
Merge branch 'wadt2014_15'
Revert "Merge branch 'wadt2014_15'"
Merge branch 'master' of https://github.com/hardik101/wadt_2014
resolved #18 & #19