pretty sure I added these before...
Merge branch 'master' of github.com:nathanielks/Shortcodes-Generator