...
Merge branch 'master' of github.com:williamstein/mazur-explicit-formula

Conflicts:
	explicit.pyx
Merge branch 'master' of github.com:williamstein/mazur-explicit-formula
do some comps soon.