{"push_id":1016106134,"size":7,"distinct_size":1,"ref":"refs/heads/master","head":"26c7646253d9f5f898b3f4f927f2d73999b4dfbd","before":"3abd0dc80f1edb76c02b4ba5fd2730b7ae0b6b0f","commits":[{"sha":"f1e4225f161d057a3d1703ee310027a862d66651","author":{"email":"714226fa3c90d66595ce21b3e3ed3741e456bee3@yahoo.com","name":"jordankm"},"message":"changed some things to make more extensible in client and main","distinct":false,"url":"https://api.github.com/repos/bdwalker93/Informatics-122-Final-Project/commits/f1e4225f161d057a3d1703ee310027a862d66651"},{"sha":"3bbb1eafc8a01da00383d9755e4953d3e4ede715","author":{"email":"714226fa3c90d66595ce21b3e3ed3741e456bee3@yahoo.com","name":"jordankm"},"message":"Merge remote-tracking branch 'origin/ClientGUI' into ClientGUI\n\n# Conflicts:\n#\t122GameServer/src/Client/Client.java\n#\t122GameServer/src/Client/Main.java","distinct":false,"url":"https://api.github.com/repos/bdwalker93/Informatics-122-Final-Project/commits/3bbb1eafc8a01da00383d9755e4953d3e4ede715"},{"sha":"e9e9a127ae3a0aa9a1639577246606e9700688a8","author":{"email":"714226fa3c90d66595ce21b3e3ed3741e456bee3@yahoo.com","name":"jordankm"},"message":"added some parse and send functions","distinct":false,"url":"https://api.github.com/repos/bdwalker93/Informatics-122-Final-Project/commits/e9e9a127ae3a0aa9a1639577246606e9700688a8"},{"sha":"3e31bf1ba53b9d9d8a7d3dc743beb1bc3052caaa","author":{"email":"714226fa3c90d66595ce21b3e3ed3741e456bee3@yahoo.com","name":"jordankm"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into ClientGUI","distinct":false,"url":"https://api.github.com/repos/bdwalker93/Informatics-122-Final-Project/commits/3e31bf1ba53b9d9d8a7d3dc743beb1bc3052caaa"},{"sha":"41319c23b2d491ad3a95151218ef04ea5b595e0f","author":{"email":"714226fa3c90d66595ce21b3e3ed3741e456bee3@yahoo.com","name":"jordankm"},"message":"added changes for demo","distinct":false,"url":"https://api.github.com/repos/bdwalker93/Informatics-122-Final-Project/commits/41319c23b2d491ad3a95151218ef04ea5b595e0f"},{"sha":"2f07cc029c693c5f39d6bf9fb7704b900a3a7e20","author":{"email":"714226fa3c90d66595ce21b3e3ed3741e456bee3@yahoo.com","name":"jordankm"},"message":"Merge branch 'master' into ClientGUI","distinct":false,"url":"https://api.github.com/repos/bdwalker93/Informatics-122-Final-Project/commits/2f07cc029c693c5f39d6bf9fb7704b900a3a7e20"},{"sha":"26c7646253d9f5f898b3f4f927f2d73999b4dfbd","author":{"email":"693c100ea3f785a6d7a2d35e7eb72a076dac96ba@yahoo.com","name":"bdwalker93"},"message":"Merge remote-tracking branch 'refs/remotes/origin/ClientGUI'","distinct":true,"url":"https://api.github.com/repos/bdwalker93/Informatics-122-Final-Project/commits/26c7646253d9f5f898b3f4f927f2d73999b4dfbd"}]}