Hibernate init
Merge branch 'master' of https://github.com/timothyjlaurent/Project3HeatedPlanet.git
Merge branch 'master' of https://github.com/timothyjlaurent/Project3HeatedPlanet.git
Commiting before merging
Merge branch 'master' of https://github.com/timothyjlaurent/Project3HeatedPlanet
Commiting for the next pull
Merge branch 'master' of https://github.com/timothyjlaurent/Project3HeatedPlanet

Conflicts:
	PlanetSim/src/models/SimulatedEarth.java
having issues merging
Committing to switch back to desktop eclipse