fixed merge
Merge pull request #4 from huytranpdx/amyvs

fixed merge conflict (hopefully)
Merge branch 'master' into huy
added work zones
Merge pull request #5 from huytranpdx/huy

Huy
Added offerings & nav functionality
added map
added css/huy link to my doc
added resources, nav bar functionality
Merge pull request #6 from huytranpdx/huy

Huy
fixed merge conflict