prøver å delete filer
m
m
m
m
Merge branch 'master' of github.com:vegardny/combat_tests