initial commit
second commit
Merge https://github.com/sigve1/prosjekt2