-Re-organized style.css
-Fixed portfolio scroll links
fixed merge conflicts