la til en
Merge branch 'Stine0.1'
Merge branch 'master' of https://github.com/stinemarie/webprosjekt32