updates
ignoring npm debugs
Merge branch 'master' into feature/navmenu
more nav update