updated nav bar
resolved merge conflict
nav bar is setup
pulling master
Merge branch 'master' into feat/bs_layout
Merge pull request #25 from domestic/feat/bs_layout

Feat/bs layout