NICK
NICK
Merge branch 'master' of https://github.com/giacomo21/Image-analysis
Merge branch 'master' of https://github.com/giacomo21/Image-analysis
Merge branch 'master' of https://github.com/giacomo21/Image-analysis
a
Merge branch 'master' of https://github.com/giacomo21/Image-analysis
A
A
A
Merge branch 'master' of https://github.com/giacomo21/Image-analysis

Conflicts:
	giacomo_nicola_test_labels/giacomo_nicola_labels.py
	giacomo_nicola_test_labels/giacomo_nicola_labels.pyc
	giacomo_nicola_test_labels/giacomo_nicola_labels.py~
	thelib/output.py~