bugfix
bugfix for merging
Merge branch 'master' of https://github.com/mitoskalandiel/OVC into db-testing
changed .gitignore
Merge pull request #2 from mitoskalandiel/db-testing

Db testing