first commit
first commit
secount commit
secount commit
Merge branch 'master' of github.com:otnorli/FYS4460-Prosjekt-1