Conflict fixed
Merge branch 'master' of https://github.com/zadbee/GoTechTask15