fjdska;lfjasdkl;fasdjkl;
Merge branch 'master' of https://github.com/Mordanis/astrophysics

Conflicts:
	solar_model/getvals.f95
	solar_model/main.f95
tidying up