fixed database schema
removed swap files
Merge pull request #2 from daviis/databaseFix

Database fix