GitHub PushEvent at 2014-05-06 05:58:00
Repository: EDA397-Group6
Actor: britsman
Payload: {"shas":[["6249ade234113f7fbc15649bf87e0579784b40cd","47061c0e5828ada3601f3df5adfabebc931a9d76@hotmail.com","Merge branch 'master' of https://github.com/Sajfer/EDA397-Group6\n\nConflicts:\n\tapp/src/main/java/com/EDA397/Navigator/NaviGitator/Activities/GitFunctionality.java","Eric Britsman",true]],"size":1,"ref":"refs/heads/master","head":"6249ade234113f7fbc15649bf87e0579784b40cd"}