Merge pull request #32 from Olyol95/master

Subgroup2
Database
Merge branch 'Subgroup2' of https://github.com/Olyol95/PIM.git into Subgroup2
Merge pull request #34 from Olyol95/Subgroup2

Subgroup2
Merge pull request #35 from Olyol95/master

database