Final commit
Merge pull request #31 from todorova-reni/master

Task1