--
solved 2b
Merge branch 'master' of https://github.com/yangt/oblig3b