Project 2
Merge branch 'master' of github.com:mariusei/FYS3150

Updating?