remove .DS_Store from cache and added .DS_Store to .gitignore
some main nav updates
Merge branch 'main_nav' into dev