Fixes #6
Merge branch 'Task2' of https://github.com/hibooboo2/SER_422_Lab3 into Task2