update
Merge branch 'master' of https://github.com/aroldoa/Primo-Motif

Conflicts:
	single-portfolio.php
	style.css