commit so i can pull latest
Merge branch 'shortcode'
fuck my life
Merge branch 'master' of https://github.com/brewlabs/sendpress