icecreammatt/class-website-template — pull request #20 by icecreammatt (2013-09-29 23:36:38+00:00)
Title: Hard Hitting Questions

@MorroMat, You merged the pull request into your own master branch. This is fine, on Thursday I'll use your fork as a demo on how to update your branch to the latest code so it can be properly merged.