mega navigation attempts
mega nav
Merge branch 'gh-pages' into mega-nav

Conflicts:
	_includes/navigation.html
Merge branch 'mega-nav' into gh-pages