fourth commit
testing merge
Merge branch 'experimental'

Conflicts:
	spherefield.pro
=More complete codebase
Merge branch 'master' of https://github.com/davidruffner/generalized-lorenz-mie