fixes merge conflicts

diff --cc docs/layouts/default.html
Simple merge

diff --cc docs/pages/css-guide.md
Simple merge

diff --cc docs/pages/index.md
Simple merge

diff --cc docs/pages/thumbnail.md
Simple merge

diff --cc docs/pages/zurb-stack.md
index 43240f5bfe732225baf5400b85b3ea0721312a10,c9a1b48359e24b7a050d6b10c6fc2ca694f806e5..23513bd750960b8868c3476d115c664ecccd6387
--- 1/docs/pages/zurb-stack.md
--- 2/docs/pages/zurb-stack.md
+++ b/docs/pages/zurb-stack.md
@@@ -3,11 -3,11 +3,11 @@@ title: ZURB Stac
  descripiton: The ZURB email stack is a boilerplate that gives you everything you need to develop and test HTML emails.
  ---
  
- Email and web development can get complicated fast. We’ve introduced the ZURB Stack which helps you get started faster and let’s you do more - without having to spend time finding the right tool for the job. The ZURB Stack includes:
+ Email and web development can get complicated fast. We’ve introduced the ZURB Stack which helps you get started faster and lets you do more - without having to spend time finding the right tool for the job. The ZURB Stack includes:
  
- - **Gulp.** This is our task runner of choice for Foundation. Gulp lets us queue up tasks to execute. This let’s us do cool things like inlining automagically updating your browser. It’s what the Stack is built on. [Find out more about Gulp](http://gulpjs.com/).
+ - **Gulp.** This is our task runner of choice for Foundation. Gulp lets us queue up tasks to execute. This lets us do cool things like inlining automagically updating your browser. It’s what the Stack is built on. [Find out more about Gulp](http://gulpjs.com/).
  - **Sass.** We use Libsass as our CSS preprocessor of choice. If you’re not familiar with Sass, it lets you use variables, nesting, and mixins (to name a few). [Learn more about Sass](http://sass-lang.com/).
 -- **Inlining.** One of the biggest headaches and time-sucks used to be inlining your HTML email. Well, no more! We’re using gulp-inline to to scan your CSS file and and automatically inject your CSS when you’re ready. Just run `npm run production` in your project when you’re ready to inline.
 +- **Inlining.** One of the biggest headaches and time-sucks used to be inlining your HTML email. Well, no more! We’re using gulp-inline to to scan your CSS file and and automatically inject your CSS when you’re ready. Just run `npm run build` in your project when you’re ready to inline.
  - **Panini.** This is our flat file generator for Foundation. Just like it’s real-world counterpart, it takes a set of ingredients and flattens them into one delicious item. This lets you separate things like the header and footer content into partials, letting you focus on your code when you’re building. It’s built off of Handlebars, which let’s you keep things super organized with partial files and repeatable sections. Checkout our [Panini Repo](https://github.com/zurb/panini).
  - **BrowserSync.** BrowserSync is awesome. It’s the specific tool in our ZURB Stack that let’s you see your code changes in the browser in real-time. Just save your code and watch the magic happen in your browser. [Learn more about BrowserSync](https://www.browsersync.io/).
  - **Image Compression.** Finally, we’ve added gulp-imagemin which intelligently reduces the file-size of your png, jpeg, gif, and svg images. This lets your emails load at lightning speeds! [Check out the gulp-imagemin repo](https://github.com/sindresorhus/gulp-imagemin).

diff --cc scss/grid/_grid.scss
Simple merge

diff --cc test/visual/pages/button-inky.html
Simple merge

diff --cc test/visual/pages/button.html
Simple merge