small change to global.css for working files, possibly undo later
Shortcodes
Merge branch 'shortcodes' into develop
some changes
Merge branch 'develop' of https://github.com/takomo-uk/wp-musclehustle into develop