Stavfel fixade
Merge branch 'master' of https://github.com/Jaernbrand/Assignment2