Cambio Sergio
Merge pull request #8 from henrikelopez/sergio

Sergio
Merge origin/master into julio

Conflicts:
	henry.php

tambien subi mi cambio