{"push_id":575290385,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"bc473d0554b3446370a4a31a0a878a84a039bc4b","before":"300c0ddabdbdda58546dfca360e34086303f2ac7","commits":[{"sha":"856c303ee6808f65c151e81eb855bce05fab07a7","author":{"email":"0aaf545ff651c67dcf8ee2bbf8ada24e32c78df7@ufl.edu","name":"Cormac McCarthy"},"message":"OOP","distinct":true,"url":"https://api.github.com/repos/jlehman93/OOP-SpaceJam-Iteration1/commits/856c303ee6808f65c151e81eb855bce05fab07a7"},{"sha":"bc473d0554b3446370a4a31a0a878a84a039bc4b","author":{"email":"0aaf545ff651c67dcf8ee2bbf8ada24e32c78df7@ufl.edu","name":"Cormac McCarthy"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tIteration1Code/bin/controller/GameController.class\n\tIteration1Code/bin/controller/MapViewController.class","distinct":true,"url":"https://api.github.com/repos/jlehman93/OOP-SpaceJam-Iteration1/commits/bc473d0554b3446370a4a31a0a878a84a039bc4b"}]}