c
Merge branch 'master' of https://github.com/niuskamora/Page

Conflicts:
	prueba.php

	modified:   prueba.php