Proj1 in class
Merge branch 'master' of https://github.com/diges/Prog272-Sundeev.git