html nesten ferdig
Merge branch 'master' of https://github.com/PJ1100Hovedproject/Hovedproject