Added the main nav
Merge pull request #10 from twg/feature/cleanup

Removing option tree
bringing in sync with develop
Merge pull request #11 from twg/feature/navs

Feature/navs
Merge branch 'develop' of github.com:twg/TEDxTheme into feature/cleanup