local macnine version
Merge branch 'master' of https://github.com/yolandamartre/proyect1

Conflicts:
	index.html