added database connection
Merge branch 'master' of https://github.com/Maromarius/387A2