Added CNAME to gitignore.
Removed CNAME to gitignore.
Re-added CNAME to gitignore.
added the guides navigation menu
Merge branch 'master' into gh-pages