it told me to commit...
Merge branch 'master' of https://github.com/JP-Ellis/Cool-Roof

Conflicts:
	integrators.py
Small attempt at simple integrator, not working...