Updated grid file name to lettuce-wrap.scss
Importing lettuce wrap into main stylesheet.
Fixed merge conflicts