moved all code from Inlämning2 to one file