{"push_id":1441893381,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"720cea76b8c3bc85d7f01f1149e481c65c6ec9d3","before":"78a6c65de45dfa4d520be69deb0c86bad952992f","commits":[{"sha":"987863eecc8e2170594d7f73f00df87ff3ac6282","author":{"name":"zt7466","email":"304bc2a047243c31b58e6fb8b767ff8fa9a8525f@ship.edu"},"message":"COME ON ACTUALLY PUSH","distinct":true,"url":"https://api.github.com/repos/zt7466/project4/commits/987863eecc8e2170594d7f73f00df87ff3ac6282"},{"sha":"720cea76b8c3bc85d7f01f1149e481c65c6ec9d3","author":{"name":"zt7466","email":"304bc2a047243c31b58e6fb8b767ff8fa9a8525f@ship.edu"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master'\n\nConflicts:\n\tFileSystem/FileSystemApp/FileSystemOperations.java\n\tFileSystem/FileSystemApp/_FileSystemStub.java\n\tFileSystemClient/src/FileSystemApp/FileSystemClient.java\n\tFileSystemServer/config.txt\n\tFileSystemServer/src/FileSystemApp/FileSystemPOA.java\n\tFileSystemServer/src/FileSystemApp/FileSystemServer.java","distinct":true,"url":"https://api.github.com/repos/zt7466/project4/commits/720cea76b8c3bc85d7f01f1149e481c65c6ec9d3"}]}
{"actor":{"display_login":"zt7466"}}