Comment that will cause merge conflict from irakliz
Merge branch 'master' of https://github.com/semere/lab5