Commiting
Merge branch 'master' of github.com:s176250/assignment1_jonasmol