changed portfolio images, favicons, and copy
fixed merged conflict