changed nav bar to different color
fixed merge conflict in app.css
changed navigation bar color
added components to the grid