Redistribución de aspecto a horizontal y otros
Merge remote-tracking branch 'origin/master'

Conflicts:
	home.php
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 0fa3567db5da39f25b1607c1ff4c562f84201b11.