Homework by Elena Arnaudova
Merge pull request #120 from Jinxxx/master

Homework by Elena Arnaudova