Commit før mat-behov
Merge branch 'master' of github.com:Jimtrim/tdt4258