added nav bar
merge conflict
Added styling
Merge pull request #30 from ansleyjones/ansleysass

Ansleysass