Sets up bootstrap nav bar, starting on other page styling
Fixes merge conflict in nav
Merge pull request #26 from kamoh/ben_work

Ben work