modified:   notebooks/anne/1-Segmentation.ipynb
	modified:   notebooks/anne/2-analysis.ipynb
	modified:   notebooks/guillaume/1-segmentation.ipynb
	modified:   notebooks/nb_init.py
	modified:   tracker/graphics.py
	modified:   tracker/segmentation.py
Merge branch 'master' of github.com:glyg/cell_migration

Conflicts:
	notebooks/guillaume/1-segmentation.ipynb
	tracker/graphics.py
	tracker/segmentation.py
	modified:   tracker/graphics.py
Trying to detect the circular portions of the trajectories