tested and set up nav bar
resolved conflicts with master, added gemfile lock to gitignore