changes in contorno html
Merge branch 'master' of https://github.com/Edupeques/dev-Edupeques

Conflicts:
	images/Thumbs.db