changes navbar to bootstrap; fixes styling issues
fixes merge conflict
Merge pull request #8 from kelseyledford/map

changes navbar to bootstrap; fixes styling issues