Fixed merge conflict
Modfied gemfile and bootstrap to fix merge conflict
Removed superflous files from public dir
Added test images for homepage
Modifed padding on body content
Added styling for layout and index

Adjusted responsiveness of nav bar and body
Added footer to layout
Added images and styled on index page
Centered footer
Changed main background color