Signed-off-by: unknown <johjo939@IFMVAK104.ad.liu.se>
Merge branch 'master' of github.com:johanjoensson/TFYA50-Computational-Physics

Conflicts:
	Documentation/Project_plan/project_plan.tex

Signed-off-by: unknown <johjo939@IFMVAK104.ad.liu.se>