Fixes #203
Merge branch 'master' of https://github.com/trendwerk/trendpress-child

Conflicts:
	assets/sass/output/style.css