Solve part 1.1
Merge branch 'master' of https://github.com/DarkDecaydence/SIGB-Group67