Changed CSS to highlight inline Source Code
Update gems
Add .cache to gitignore
Add execjs and rubyracer to Gemfile, should resolve #12
Merge pull request #16 from tripit/dev

Update gems and add execjs and therubyracer
Add ability to split content in include files.
Changed highlighting of in-line source code to make it stand out more
Add explanation of partials to _errors.md
Add link in README to Build a Quine tutorial
Update jQuery to work over SSL, resolves #18
Update gems
Add PricePlow to README
Update gems
Merge branch 'dev' of https://github.com/tripit/slate into DevNet-Slate

Conflicts:
	.gitignore
	README.md
	source/index.md
Merging changes from Updated on Gems

Merging changes from Root
Updated to fix problem with Header on Sample and updated CSS
Add a separation between the sidebar and the content
Merge pull request #1 from yannikmesserli/sidebar-modif

Add a separation between the sidebar and the content
Cleared out Merge markings
Updated documentation to include supported GFM tags