First merge for feature 3
Merge branch 'master' of https://github.com/Programvaresikkerhet/Bookstore
Small fix
Merge branch 'master' of https://github.com/Programvaresikkerhet/Bookstore
Merge branch 'master' of https://github.com/Programvaresikkerhet/Bookstore