Added [columns] shortcode
Merge pull request #12 from mbeall/master

Added shortcodes