Merge pull request #3 from ministeriosIMIM/dev

Dev
Revert "Merge pull request #3 from ministeriosIMIM/dev"

This reverts commit 1a8fa6237f28c38b5e87e97aa4345310e1ded55b, reversing
changes made to bd9dc26fffec7c5399497eef6376e8bf85bd35fe.
Revert "Merge pull request #2 from ministeriosIMIM/master"

This reverts commit 48e436a336ba06f5378fb3a0952c0dd389f0ff83, reversing
changes made to 4f95f84fb986a055cc4fd08e184dcaae9b27b7d3.
gitignore  master
Merge branch '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'
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