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

Conflicts:
	wp-content/themes/zwipeTheme/footer.php