fixed database and naming completely
Merge pull request #20 from jonnyparris/database_done

fixed database and naming completely