GitHub PushEvent at 2014-09-11 00:50:20
Repository: 3308lab
Actor: pgoudy
Payload: {"shas":[["f3dbe3eb939249728123034c1480957ca2c27a2b","40e74c9b03eecbb67b7199a2dbc2468e15232c84@gmail.com","Merge Conflict","Peter Goudy",true],["07899625fc8f7f5b51e673ee3dcf54b440354daf","40e74c9b03eecbb67b7199a2dbc2468e15232c84@gmail.com","Merge branch 'master' of https://github.com/pgoudy/3308lab\n\nConflicts:\n\tREADME.md","Peter Goudy",true]],"size":2,"ref":"refs/heads/master","head":"07899625fc8f7f5b51e673ee3dcf54b440354daf"}