Merge branch 'master' into gh-pages

* master:
  config changes
config
Updated _posts/shows/2013-04-21-your-filename.md
added CNAME file
Merge branch 'gh-pages' of github.com:jakemhiller/cheerleadersounds into gh-pages

* 'gh-pages' of github.com:jakemhiller/cheerleadersounds:
  Updated _posts/shows/2013-04-21-your-filename.md
Merge branch 'gh-pages'

* gh-pages:
  added CNAME file
  Updated _posts/shows/2013-04-21-your-filename.md
  config
Merge branch 'master' of github.com:jakemhiller/cheerleadersounds

* 'master' of github.com:jakemhiller/cheerleadersounds:
  Deleted _posts/shows/2013-04-21-your-filename.md
  Updated _posts/shows/2013-04-21-your-filename.md