Merge pull request #31 from Olyol95/master

Subgroup1
Merge pull request #35 from Olyol95/master

database
Merge pull request #36 from Olyol95/Subgroup1

Subgroup1