some changes
Merge branch 'master' of https://github.com/headphonesjones/rd-redesign

Conflicts:
	radio/app/styles/_shows.scss
Merge branch 'master' of https://github.com/headphonesjones/rd-redesign

Conflicts:
	radio/app/views/shows.html