Started on oblig2
Merge branch 'master' of https://github.com/jvbrink/INF5620