Assignment 1 commit
Merge branch 'master' of https://github.com/ohjelmistoprojekti/group2