boilerplate - mostly done
Merge branch 'master' of github.com:UniversityRadioYork/MyRadio

* 'master' of github.com:UniversityRadioYork/MyRadio:
  6 hours? Wut.