moved link colors into sass
fixed conflicts