{"shas":[["7fd4d745b30fdba42a3550e5411af7312416db86","3d7a0f7b40c364be31b6f959a702d3d09937446a@hotmail.com","Merge branch 'master' into vale\n\nConflicts:\n\tbuild/classes/Tablero.class\n\tbuild/classes/Taco.class\n\tbuild/test/classes/TableroTest.class\n\tsrc/Tablero.java\n\ttest/TableroTest.java","Vale"]],"ref":"refs/heads/master","size":1,"head":"7fd4d745b30fdba42a3550e5411af7312416db86","push_id":32223206}