wrote failing test for building the nav bar
fixed merge conflicts