Merge branch 'master' of https://github.com/Lahlquist/group_02_2sem.git