finished step 7
Merge branch 'master' of github.com:MartinFaartoft/sigb