Adding possible merge conflict
Merge branch 'master' of https://github.com/annapodoplelova/CSCI3308Lab2