Added switch statements
Merge branch 'master' of github.com:oyvindym/fellesprosjekt