Added bootstrap to gemfile and styling nav
Bringing over previous css to style pages
Fixing merge conflict