Merge pull request #12 from canzalon/master

Syncing master and develop branch
Modify portfolio html and css
Merge pull request #13 from canzalon/develop

Develop