interface added
interface added
Fixed merge conflict
Merge branch 'master' of ssh://git@github.com/jonasws/Fellesprosjekt.git
Added interface