shortcodes intro
Merge branch 'gh-pages' of https://github.com/fitwp/docs into gh-pages