new
new new
Merge branch 'master' of github.com:giacomo21/Image-analysis

Conflicts:
	giacomo_analysis.pyc
	giacomo_average.pyc
	marco_load.pyc