Updated simulated earth cooling adjascent heating and cooling
Updated simulated earth cooling adjascent heating and cooling
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of github.com:timothyjlaurent/Project3HeatedPlanet
in progress simulation calculation settings.
first draft of calculations. Needs testing.
Merge remote-tracking branch 'origin/master'

Conflicts:
	PlanetSim/src/models/Experiment.java