Merge branch 'master' of https://github.com/rdunlop/unicycling-registration
Merge remote-tracking branch 'scott/master'