deleted test.txt
Merge branch 'master' of https://github.com/Dauntless-/dagsverket_team01
Merge branch 'master' of https://github.com/Dauntless-/dagsverket_team01