Unbreaking your master branch

I accidentally merged a branch into master, and then I pushed. Bah!

My colleague found this link:

http://www.mikeplate.com/2012/04/21/rewind-master-if-you-forgot-to-create-new-branch-in-git/

Now it's like my mistake never happened. Booyah!