{"push_id":945441202,"size":4,"distinct_size":4,"ref":"refs/heads/master","head":"da89f3f992947abe035574388735e2f29318c075","before":"4429dde064e96000df8bb67a208e3d461d422153","commits":[{"sha":"30e3af9f4a5270b951ed726ea0bfdf0611d897f3","author":{"email":"cce6677ac14177c509f4518e9db428ce14518c35","name":"David Ostler"},"message":"updated files","distinct":true,"url":"https://api.github.com/repos/airhop/cs340zoo/commits/30e3af9f4a5270b951ed726ea0bfdf0611d897f3"},{"sha":"2f8ae6fb4d4b010415f12fb39c6004ec4cb2e128","author":{"email":"cce6677ac14177c509f4518e9db428ce14518c35","name":"David Ostler"},"message":"Merge branch 'master' of https://github.com/airhop/cs340zoo\n\n# Conflicts:\n#\tclient/model/history/Chat.java\n#\tclient/model/history/Log.java","distinct":true,"url":"https://api.github.com/repos/airhop/cs340zoo/commits/2f8ae6fb4d4b010415f12fb39c6004ec4cb2e128"},{"sha":"d57c9daaf37a05c609bc2811818475af23ed91b8","author":{"email":"cce6677ac14177c509f4518e9db428ce14518c35","name":"David Ostler"},"message":"Merge branch 'master' of https://github.com/airhop/cs340zoo\n\n# Conflicts:\n#\tclient/model/player/Player.java","distinct":true,"url":"https://api.github.com/repos/airhop/cs340zoo/commits/d57c9daaf37a05c609bc2811818475af23ed91b8"},{"sha":"da89f3f992947abe035574388735e2f29318c075","author":{"email":"cce6677ac14177c509f4518e9db428ce14518c35","name":"David Ostler"},"message":"Merge branch 'master' of https://github.com/airhop/cs340zoo","distinct":true,"url":"https://api.github.com/repos/airhop/cs340zoo/commits/da89f3f992947abe035574388735e2f29318c075"}]}