stub out a navbar
fix conflict and add *.DS_Store to .gitignore