a
aMerge branch 'master' of github.com:giacomo21/Image-analysis

Conflicts:
	analysis.pyc
aMerge branch 'master' of github.com:giacomo21/Image-analysis
ok Merge branch 'master' of github.com:giacomo21/Image-analysis
Merge branch 'master' of github.com:giacomo21/Image-analysis
ok