matching post styles
git commitMerge branch 'master' of https://github.com/WIREDTECH/pangea
:quit

Conflicts:
	themes/wired/assets/css/css/wired-front.css
	themes/wired/assets/css/css/wired-mag.css
	themes/wired/assets/css/css/wired-master.css
	themes/wired/assets/css/sass/components/global.scss