2nd connection
Merge branch 'master' of https://github.com/EdNeg/DB-Project