Cambio a Juan David
Merge remote-tracking branch 'origin/master'

Conflicts:
	Index.php