Ny klasse for innstillinger
Nytt view i storyboard
Merge remote-tracking branch 'origin/firstcharades' into firstcharades
merge konflikt