Cambios Style
Merge branch 'master' of https://github.com/donnicopalma/CC

Conflicts:
	wp-content/themes/twentythirteen/content.php
Merge branch 'master' of https://github.com/donnicopalma/CC

Conflicts:
	wp-content/themes/twentythirteen/content.php