{"push_id":609282993,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"c6eee33c899fe15b8084fa4b01bca86437305179","before":"003169a60c9a4613de2b9c5f18bfb7108f458f1c","commits":[{"sha":"920b235d36d94525f287b1b0fc9f56fd3b0020fe","author":{"email":"19f13587996afec4191bb8c2c0cf90a56de79e7b@gmail.com","name":"Gerryflap"},"message":"Added serverside objects Ship and Meteor and added a lot of server functionality.","distinct":true,"url":"https://api.github.com/repos/goldenice/GameJam-Server/commits/920b235d36d94525f287b1b0fc9f56fd3b0020fe"},{"sha":"c6eee33c899fe15b8084fa4b01bca86437305179","author":{"email":"19f13587996afec4191bb8c2c0cf90a56de79e7b@gmail.com","name":"Gerryflap"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tsrc/gamejam/server/objects/nonphysical/Client.java","distinct":true,"url":"https://api.github.com/repos/goldenice/GameJam-Server/commits/c6eee33c899fe15b8084fa4b01bca86437305179"}]}