added bootstrap gem
resolved conflict
added background image and modal
added nav bar
updated drop down link in nav bar
messing with nav bar
finished correcting merge conflicts