Merge branch 'master' of https://github.com/veuse/Veuse-Portfolio

Conflicts:
veuse-portfolio.php
Changes