{"push_id":854954544,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"cfd32f24e2dc1173f36069d18f24fb9d9cbdf529","before":"44839e6a8cbf3db89fbb631c4b0b2794aabc2902","commits":[{"sha":"f519416fba477306962fa4dc309425830afde1f4","author":{"email":"5dbb9f72c54e1276a4bc864d6fe090aafa520a82@gmail.com","name":"Loc Truong"},"message":"Split the GUIs into proper classes (No more spaghetti!). Still getting\nthat end of file exception when reading JSONObject from\nObjectInputStream...","distinct":true,"url":"https://api.github.com/repos/cs537-Fall-2015/ChemCam/commits/f519416fba477306962fa4dc309425830afde1f4"},{"sha":"cfd32f24e2dc1173f36069d18f24fb9d9cbdf529","author":{"email":"5dbb9f72c54e1276a4bc864d6fe090aafa520a82@gmail.com","name":"Loc Truong"},"message":"Merge branch 'master' of https://github.com/cs537-Fall-2015/ChemCam\n\nConflicts:\n\tChemCamSimulator/build/classes/gui/ChemCamAgentPanel.class\n\tChemCamSimulator/build/classes/gui/ChemCamControllerPanel$1.class\n\tChemCamSimulator/build/classes/gui/ChemCamControllerPanel$2.class\n\tChemCamSimulator/build/classes/gui/ChemCamControllerPanel.class\n\tChemCamSimulator/build/classes/gui/ChemCamMainFrame$1.class\n\tChemCamSimulator/build/classes/gui/ChemCamMainFrame.class\n\tChemCamSimulator/build/classes/json/ReadFromJSON.class\n\tChemCamSimulator/build/classes/json/WriteToJSON.class","distinct":true,"url":"https://api.github.com/repos/cs537-Fall-2015/ChemCam/commits/cfd32f24e2dc1173f36069d18f24fb9d9cbdf529"}]}