For the merge
Merge branch 'master' of https://github.com/dlpeatman/lab2
magic
magic