información arreglada
Merge branch 'master' of https://github.com/niuskamora/Page

Conflicts:
	recursos/img/9.png

	modified:   recursos/img/9.png