Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of https://github.com/statamic/statamic-cheat-sheet into gh-pages
Adding the redactor - resize options
Merge pull request #17 from pmeissner/patch-1

Adding the redactor - resize options
New 1.7 variable modifiers
entries:previous and entries:next
Merge pull request #18 from pmeissner/patch-2

New 1.7 variable modifiers
Merge pull request #20 from pmeissner/patch-4

entries:previous and entries:next
Merge branch 'master' into gh-pages

Conflicts:
	index.html
Fixed merge conflict.
Merge branch 'gh-pages'