change the logo position, and modify the header layout.
modify nav
Merge branch 'master' of https://www.github.com/zhangsm/campo

merge