report finished
Merge branch 'master' of github.com:felixhekhorn/UiO-FYS4411
prefinal version of the report