new ipython code
Merge branch 'master' of https://github.com/dknoester/sunspot

Conflicts:
	math/analysis.ipynb