barcamp-1/barcamp-1.github.io — pull request #12 by ethomson (2013-10-27 15:55:23+00:00)
Title: conflict

Yoinks!