ch ch ch changes

dg
Merge branch 'master' of https://github.com/socd-io/Show-2014-Website