diskusjon ws1
Merge branch 'master' of https://github.com/mathilwa/Master2013