Merge branch '1-dim-Array'
Merge branch 'master' of https://github.com/johalnes/oblig3