fixed navbar
merged Gemfile