conflict
Merge branch 'master' of https://github.com/josander/Computational-physics-HP2
autocorr