README
Merge branch 'master' into After
Nav bar fixes