update
Merge branch 'master' of https://github.com/mrpsharp/python

Conflicts:
	comets/.ipynb_checkpoints/comet1-checkpoint.ipynb
	comets/comet1.ipynb
	comets/comet2.ipynb