Merge branch 'master' into develop

This commit is contained in:
Michael Rose 2013-08-08 13:40:14 -04:00
commit 262cc00b39

View file

@ -30,6 +30,8 @@ General notes and suggestions for customizing So Simple Theme.
5. Check out the sample posts in `_posts` to see examples for pulling in large feature images, assigning categories and tags, and other YAML data.
6. Read the documentation below for further customization pointers and documentation.
**Pro-tip:** Delete the `gh-pages` branch after cloning and start fresh by branching off `master`. There is a bunch of garbage in `gh-pages` used for the theme's demo site that I'm guessing you don't want on your site.
---
## Setup for Existing Jekyll site