Black Holes and Solar Flare in the works
Files that should have went in the previous commit but didn't
SolarFlares and new Newtons!
Merge commit '2ac797cfe98a608ac638698138fb602f67f4c046' into Ivo_Lab

Conflicts:
	Projectfiles/Box.mm
	Projectfiles/CelestialObject.h
	Projectfiles/CelestialObject.mm
	Projectfiles/GravitationalObject.h
	Projectfiles/GravitationalObject.mm
	Projectfiles/Ship.mm