subcategory file
Merge branch 'master' of github.com:carolive/caroliveenhispanoamerica

Conflicts:
	carolive-hispanoamerica/wp-content/themes/carolive/functions.php