added smooth scroll functionality to site
nav links change color with section. sweet.
Resolve merge conflicts