Merge pull request #29 from RajeebTheGreat/shortcodes

[Shortcode] Add some content shortcodes