started adding navigation in
fixed merge conflict
nav styling
Merge branch 'fall-release' of github.com:meltmedia/whyaz into fall-release
intro and featured section styling