all sorts of stuff
Merge branch 'master' of https://github.com/headphonesjones/rd-redesign

Conflicts:
	radio/app/views/shows.html