prep for pull
Merge branch 'master' of github.com:johanjoensson/TFYA50-Computational-Physics

Conflicts:
	Code/Project_v0.01/Project_v0.01/world.cpp
	Code/Project_v0.01/Project_v0.01/world.h