Cambio 4

dsfsdfsd
Merge remote-tracking branch 'origin/master'

Conflicts:
	info.php