new file:   tifffile.py
	new file:   1 Segmentation and detection.ipynb
Merge branch 'dev'

Conflicts:
	notebooks/1 Segmentation and detection.ipynb
	modified:   1 Segmentation and detection.ipynb
	deleted:    Close_merge_split.ipynb
	deleted:    GFP_segmentation.ipynb
	deleted:    Processing.ipynb
	deleted:    Segmentation_of_the_nuclei.ipynb
	deleted:    Tracking.ipynb
Fixed crash with invalid tiff file
bug fixes
notebook commit
Modified segmentation to track arbitrary number of objects
Better exclusion of the undesired cells
New more explicit notebook for data analysis
Minor bug fix
import tifffile at init
	new file:   ../saved_data/20130605-WT-S1.h5
	new file:   ../saved_data/20130605-WT-S1_metadata.json
	modified:   notebooks/1 Segmentation and detection.ipynb
	modified:   tracker/segmentation.py
choix pou redemarrer l'optimisation
	renamed:    1 Segmentation and detection.ipynb -> 1 Segmentation and detection _ Guillaume.ipynb
merging
deleted bad
 added my notebook
	modified:   notebooks/1 Segmentation and detection Nathalie.ipynb
	modified:   notebooks/1 Segmentation and detection _ Guillaume.ipynb
	new file:   saved_data/20130620-SpastinS1_metadata.json
	new file:   saved_data/20130620-SpastinS5_metadata.json
	new file:   saved_data/BC WT 01072013_metadata.json
	new file:   saved_data/BC WT 03072013_metadata.json
	new file:   saved_data/BC WT 23062013_metadata.json