Did stuff.
Changed things around.
Merge branch 'tex'
Merge branch 'master' of github.com:PaulMag/FYS3150_project3