prep for pull
Merge branch 'master' of github.com:johanjoensson/TFYA50-Computational-Physics
it compiles, but is not correct