{"push_id":856580466,"size":7,"distinct_size":1,"ref":"refs/heads/master","head":"87dbe8baeebee7aa09822711294ae508355d91d4","before":"b132928e79cfa0dcc06c7db42edf9589d0a8dbfb","commits":[{"sha":"b083af0a1caef040277ce9e5ddc5f535156ce2ef","author":{"email":"23443d37e79a0f3e1e332b9df4f5f7eaa77224e0@gatech.edu","name":"twhitfield6"},"message":"Merge branch 'master' into Tyler","distinct":false,"url":"https://api.github.com/repos/HunterMorrell/CS-2340---Team-Modern-Mango/commits/b083af0a1caef040277ce9e5ddc5f535156ce2ef"},{"sha":"ed7050b9a717177c83a6c1fe5146d2f0849db706","author":{"email":"23443d37e79a0f3e1e332b9df4f5f7eaa77224e0@gatech.edu","name":"twhitfield6"},"message":"Initial save/load","distinct":false,"url":"https://api.github.com/repos/HunterMorrell/CS-2340---Team-Modern-Mango/commits/ed7050b9a717177c83a6c1fe5146d2f0849db706"},{"sha":"8443aadd31d667b43d68cb11e9408069badda1a0","author":{"email":"23443d37e79a0f3e1e332b9df4f5f7eaa77224e0@gatech.edu","name":"twhitfield6"},"message":"load/save\n\nConflicts:\n\tsrc/mule/model/ConfigureController.java\n\tsrc/mule/model/GameController.java\n\tsrc/mule/model/Player.java\n\tsrc/mule/model/StoreController.java","distinct":false,"url":"https://api.github.com/repos/HunterMorrell/CS-2340---Team-Modern-Mango/commits/8443aadd31d667b43d68cb11e9408069badda1a0"},{"sha":"d7cced64670b334f491d5b9bd716eb862fb20a07","author":{"email":"23443d37e79a0f3e1e332b9df4f5f7eaa77224e0@gatech.edu","name":"twhitfield6"},"message":"Merge branch 'master' into Tyler\n\nConflicts:\n\tsrc/mule/model/ConfigureController.java\n\tsrc/mule/model/GameController.java\n\tsrc/mule/model/Player.java\n\tsrc/mule/model/StoreController.java","distinct":false,"url":"https://api.github.com/repos/HunterMorrell/CS-2340---Team-Modern-Mango/commits/d7cced64670b334f491d5b9bd716eb862fb20a07"},{"sha":"6cc860b6e93a824b09f2790a74d69230815251ca","author":{"email":"23443d37e79a0f3e1e332b9df4f5f7eaa77224e0@gatech.edu","name":"twhitfield6"},"message":"fixed problem","distinct":false,"url":"https://api.github.com/repos/HunterMorrell/CS-2340---Team-Modern-Mango/commits/6cc860b6e93a824b09f2790a74d69230815251ca"},{"sha":"d2be2e868a86de3dbd1748cf48ae3fba35539c1c","author":{"email":"23443d37e79a0f3e1e332b9df4f5f7eaa77224e0@gatech.edu","name":"twhitfield6"},"message":"Merge branch 'master' into Tyler\n\nConflicts:\n\tsrc/mule/model/ConfigureController.java\n\tsrc/mule/model/EnergyMule.java\n\tsrc/mule/model/FoodMule.java\n\tsrc/mule/model/Game.java\n\tsrc/mule/model/GameController.java\n\tsrc/mule/model/Mule.java\n\tsrc/mule/model/OreMule.java\n\tsrc/mule/model/Player.java\n\tsrc/mule/model/Store.java\n\tsrc/mule/model/StoreController.java\n\tsrc/mule/view/Game.fxml\n\tsrc/mule/view/GameConfigure.fxml","distinct":false,"url":"https://api.github.com/repos/HunterMorrell/CS-2340---Team-Modern-Mango/commits/d2be2e868a86de3dbd1748cf48ae3fba35539c1c"},{"sha":"87dbe8baeebee7aa09822711294ae508355d91d4","author":{"email":"23443d37e79a0f3e1e332b9df4f5f7eaa77224e0@gatech.edu","name":"twhitfield6"},"message":"Merge pull request #67 from HunterMorrell/Tyler\n\nTyler","distinct":true,"url":"https://api.github.com/repos/HunterMorrell/CS-2340---Team-Modern-Mango/commits/87dbe8baeebee7aa09822711294ae508355d91d4"}]}