Merge branch 'master'

Conflicts:
NParticleSimulationJul10/MainMethod.py
renamed **kwargs for planets
Merge branch 'Temp'

Conflicts:
	NParticleSimulationJul10/MainMethod.py