edit and add
Merge branch 'master' of https://github.com/ovidio43/niaf

Conflicts:
	wp-content/themes/Themeniaft/functions.php