nav working
Merge branch 'master' of github.com:eddiej/angular-photostream