added shortcodes
Merge branch 'master' into shortcode
Merge branch 'master' into shortcode
Merge branch 'master' into shortcode
added ability to set attributes and also renamed to wpthumb
Merge pull request #56 from humanmade/shortcode

Add "img" shortcode