estilo padding
Merge origin/master

Conflicts:
	public_html/CSS/CSS2.css