style update
Merge branch 'master' of github.com:cambraca/rants

Conflicts:
	themes/custom/minirants/sass/components/_template.scss
	themes/custom/minirants/sass/styles.css