Resolve _nav.scss conflict
Merge branch 'danaw-master'
Merge pull request #28 from ProjectFrank/master

Add lines between nav items