I'm bad at markdown
Merge branch 'master' of https://github.com/stlwpdev/WordCamp-2013