Added nav bar & about section
Merge pull request #2 from huytranpdx/amyvs

Amyvs
Merge branch 'master' into huy
Merge branch 'huy'
merge conflict
fixed merge conflicts
fixed merge conflict (hopefully)