testers fra netbeans
Merge origin/Beta into Beta
Merge origin/Beta into Beta
testare
Merge branch 'Beta' of https://github.com/henrikfischer/Programmutvikling-hovedprosjekt into Beta