commit
Merge branch 'master' of https://github.com/farodrig/Iris_Recognition

Conflicts:
	presentacion.m
Merge branch 'master' of https://github.com/farodrig/Iris_Recognition