Merge pull request #2 from ferdythebull/master

Updated the README.md
updated database settings
Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from genenettles2/master

please pull