changes
Merge branch 'master' of https://github.com/gudmundurste12/Prog3
Merge branch 'master' of https://github.com/gudmundurste12/Prog3
changes