fixed merge conflict (hopefully)
Merge pull request #4 from huytranpdx/amyvs

fixed merge conflict (hopefully)
Merge branch 'master' into huy
added work zones