sync loop-shortcode
Merge branch 'master' of https://github.com/ubc/loop-shortcode
Merge pull request #1 from ubc/master

updating to master