commit
Merge branch 'master' of https://github.com/Tadimsky/CS356-Lab-1
resolve
Merge branch 'master' of https://github.com/Tadimsky/CS356-Lab-1