Resolved the merge conflicts#82

OlgaNazarenko wants to merge 4 commits intodtxe:maindtxe/DSI_git_assignment:mainfrom

OlgaNazarenko:mainOlgaNazarenko/DSI_git_assignment:mainCopy head branch name to clipboard