Conflitto per DS_STORE
Merge branch 'master' of https://github.com/guarino85/terre-apulia

Conflicts:
	wp-content/themes/.DS_Store