corrección _tipografia.scss
Merge branch 'master' into dev

Conflicts:
	.gitignore
	wp-content/themes/sublimeradio/apple-touch-icon-precomposed.png
	wp-content/themes/sublimeradio/css/main.css
	wp-content/themes/sublimeradio/favicon.ico
	wp-content/themes/twentyfourteen/header.php
Merge branch 'dev'

Conflicts:
	wp-content/themes/sublimeradio/css/main.css