Prep for pull, crash fixes as well
Merge branch 'master' of github.com:johanjoensson/TFYA50-Computational-Physics

Conflicts:
	Code/Project_GUI_v.0.01/Project_GUI_v.0.01/Project_GUI_v.0.01.cpp