Resolved merging conflict
includes/portfolio (en): Added a new project
portfolio/schiphol (en): Added new project page
images: Added thumb for Schiphol project
portfolio/schiphol (en): Added more details to the project
includes/header (en): Changed the base path
includes/social_networks (en): Added Pinterest account
images/icons/Pinterest: Added icon for Pinterest
portfolio/schiphol (en): Added photos, fixed link and completed content
images: Added images for Schiphol project
portfolio/schiphol (en): Improved the content
portfolio/schiphol (en): Fixed typo
includes/portfolio-subnav (es): Added Schiphol project to portfolio
portfolio (en): Added Schiphol project page
includes/social_networks (es): Added Pinterest account