Merge branch 'master' of https://github.com/Drotth/DA401A
assignment 1 version