edd
Merge branch 'master' of https://github.com/ovidio43/lafolklorisima

Conflicts:
	wp-content/themes/themeLafolklorisma_v2/index.php