working portfolio stage one
Try and fix merge issue