{"push_id":555662675,"size":7,"distinct_size":3,"ref":"refs/heads/Jims-Branch","head":"c5478a904fd3161ce123939889118013f1fcfce0","before":"a92de6078b760178d8f8ecb67052dc3e4bae52a3","commits":[{"sha":"d365334596c4c6d3be76c9e04533324a9d4ab488","author":{"email":"40381bd7789e208b6952450a1a98b4f14664a59e@gmail.com","name":"Nick Snyder"},"message":"Added Mix Limiting Shots","distinct":false,"url":"https://api.github.com/repos/WelchCompositions/PotionDisaster/commits/d365334596c4c6d3be76c9e04533324a9d4ab488"},{"sha":"5deba752ce55b0490e39b765ff1d14ce511cc894","author":{"email":"40381bd7789e208b6952450a1a98b4f14664a59e@gmail.com","name":"Nick Snyder"},"message":"Merge remote-tracking branch 'origin/Jims-Branch' into Nicks-Branch\n\nConflicts:\n\tAssets/_Materials/MixButton.mat\n\tAssets/_Materials/MixtureTub.mat\n\tAssets/_Materials/PotionA.mat\n\tAssets/_Materials/PotionB.mat\n\tAssets/_Prefabs/bullet.prefab\n\tAssets/_Scenes/labScene.unity\n\tAssets/_Scripts/PotionCombinations.cs","distinct":false,"url":"https://api.github.com/repos/WelchCompositions/PotionDisaster/commits/5deba752ce55b0490e39b765ff1d14ce511cc894"},{"sha":"22761cf9c6f2d0a82e631d0391492fccc9a0cc15","author":{"email":"40381bd7789e208b6952450a1a98b4f14664a59e@gmail.com","name":"Nick Snyder"},"message":"Merged In Changes","distinct":false,"url":"https://api.github.com/repos/WelchCompositions/PotionDisaster/commits/22761cf9c6f2d0a82e631d0391492fccc9a0cc15"},{"sha":"4ea6a6f67431a9748cffac7dcc15d7494ef3276b","author":{"email":"7627f9952b9c378edc494c5751804403e5973074@welchcompositions.com","name":"Jim Welch"},"message":"Merge remote-tracking branch 'origin/Nicks-Branch' into Jims-Branch","distinct":true,"url":"https://api.github.com/repos/WelchCompositions/PotionDisaster/commits/4ea6a6f67431a9748cffac7dcc15d7494ef3276b"},{"sha":"32aad45d6586b7fa216d7b7f8c854ee9d31e3019","author":{"email":"40381bd7789e208b6952450a1a98b4f14664a59e@gmail.com","name":"Nick Snyder"},"message":"added game states","distinct":false,"url":"https://api.github.com/repos/WelchCompositions/PotionDisaster/commits/32aad45d6586b7fa216d7b7f8c854ee9d31e3019"},{"sha":"1121177d9dd58dd5da1e4d9288a9a89f8c8c932f","author":{"email":"7627f9952b9c378edc494c5751804403e5973074@welchcompositions.com","name":"Jim Welch"},"message":"Merge remote-tracking branch 'origin/Nicks-Branch' into Jims-Branch","distinct":true,"url":"https://api.github.com/repos/WelchCompositions/PotionDisaster/commits/1121177d9dd58dd5da1e4d9288a9a89f8c8c932f"},{"sha":"c5478a904fd3161ce123939889118013f1fcfce0","author":{"email":"7627f9952b9c378edc494c5751804403e5973074@welchcompositions.com","name":"Jim Welch"},"message":"Added stuff???","distinct":true,"url":"https://api.github.com/repos/WelchCompositions/PotionDisaster/commits/c5478a904fd3161ce123939889118013f1fcfce0"}]}