GitHub PushEvent at 2014-04-02 07:52:30
Repository: PSU_IST240_GROUP5
Actor: nautilie7
Payload: {"shas":[["342262c1737b4db9709b9667a52b290af535313f","5c796969877f11c7bb68138d2379c3dc7ca64a96@N7-Desk","Merge origin/master\n\nConflicts:\n\t.gitignore\n\tsrc/bottomPanel.java\n\tsrc/mainPanel.java","Richard",true]],"size":1,"ref":"refs/heads/master","head":"342262c1737b4db9709b9667a52b290af535313f"}