Uppdateringar till labb1
Merge branch 'master' of github.com:gusnan/scripts_grund
Merge branch 'master' of github.com:gusnan/scripts_grund