Merge pull request #3 from Tornaldo/torDB

Fiksa bug
some changes are made to database, but they are not completed or tested as of now
Merge branch 'master' of https://github.com/Tornaldo/Corsane into torDB