added database
Merge branch 'master' of https://github.com/NiklasLM/cj-db-project