Autogenerated gh-pages for commit b1061d7 Author: Guilhem Doulcier <guilhem.doulcier@ens.fr>

    gendoc
Autogenerated gh-pages for commit b1061d7
Author: Guilhem Doulcier <guilhem.doulcier@ens.fr>

    gendoc
Merge branch 'gh-pages' of https://github.com/geeklhem/pimad into gh-pages

Conflicts:
	doc/_build/doctrees/environment.pickle
	traces.pyc