Flyttade lite hårdkodade strängar
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of github.com:Meldanya/pvg-vt13-team03