?
Merge branch 'master' of https://github.com/josander/Computational-physics-HP1
spectral schmecktral!
fixed conflict