ok
okMerge branch 'master' of github.com:giacomo21/Image-analysis

Conflicts:
	marco_code.py
okMerge branch 'master' of github.com:giacomo21/Image-analysis
Merge branch 'master' of github.com:giacomo21/Image-analysis
created thelib.[Marco]
okMerge branch 'master' of github.com:giacomo21/Image-analysis