added bootstrap navbar
merge conflict