added support for shortcode nesting
Merge pull request #3 from kellenmace/master

added support for shortcode nesting