fick en merger conflict
Merge branch 'master' of https://github.com/TeamPrego/Code
Merge branch 'master' of https://github.com/TeamPrego/Code