Updating header and navs
Merge branch 'master' of github.com:mgbelisle/zoe