updated name and title
Merge branch 'master' of github.com:magnhalv/Infosikkerhet
merge