GitHub PushEvent at 2014-10-06 19:48:46
Repository: Tigers
Actor: jgibbs2
Payload: {"shas":[["059b2d6fe248cfd461720bb48731aa80fad284ba","7eddc4cc005cdb080ac587443d133c9a970ed0c1","temporary first stage of combat","jgibbs2",true],["95ac02f4f42215c432b31089f0dba8419b5de8eb","7eddc4cc005cdb080ac587443d133c9a970ed0c1","Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tPacSenProject/Assets/Player Class.cs","jgibbs2",true]],"size":2,"ref":"refs/heads/master","head":"95ac02f4f42215c432b31089f0dba8419b5de8eb"}