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

Conflicts:
	load.pyc