added some new defintions
Merge branch 'master' of https://github.com/mtarnes/masteroppgave