{"push_id":863989692,"size":7,"distinct_size":1,"ref":"refs/heads/davidzeng","head":"881ad9b54781e225710f094f9d68d3b86fafa7e1","before":"fcbd7d1e4a4510f1d79866f0bdbf2f04b3fc7dc3","commits":[{"sha":"58ec71e016dd8dc4751ec7019329878b68ab2cc3","author":{"email":"9e857e64ee28e92f9ed76f0357bb0354592de5a0@gmail.com","name":"egruman"},"message":":p","distinct":false,"url":"https://api.github.com/repos/GCSShatteredSpace/Main-Working-Repository/commits/58ec71e016dd8dc4751ec7019329878b68ab2cc3"},{"sha":"d6370c404ffef043d9fcefb5becb773fc90b5c02","author":{"email":"9e857e64ee28e92f9ed76f0357bb0354592de5a0@gmail.com","name":"egruman"},"message":"Merge branch 'master' of https://github.com/GCSShatteredSpace/Main-Working-Repository\n\nConflicts:\n\tShatteredSpace/Assets/Prefabs/particle effects.prefab.meta\n\tShatteredSpace/Assets/Scripts/New/boardManager.cs\n\tShatteredSpace/ProjectSettings/ProjectSettings.asset\n\tShatteredSpace/ProjectSettings/UnityAdsSettings.asset\n\tShatteredSpace/ProjectSettings/UnityAnalyticsManager.asset","distinct":false,"url":"https://api.github.com/repos/GCSShatteredSpace/Main-Working-Repository/commits/d6370c404ffef043d9fcefb5becb773fc90b5c02"},{"sha":"74c98bd300737086ff14caacd8d9e8a14569633c","author":{"email":"9d76079a61b0c4398350c3b4d898c5c7c27f5fe5@andrew.cmu.edu","name":"matthew9671"},"message":"We have menus for building weapons now\\!","distinct":false,"url":"https://api.github.com/repos/GCSShatteredSpace/Main-Working-Repository/commits/74c98bd300737086ff14caacd8d9e8a14569633c"},{"sha":"175f2111053e679dd173ebe223ac9ba2cbde4c79","author":{"email":"9d76079a61b0c4398350c3b4d898c5c7c27f5fe5@andrew.cmu.edu","name":"matthew9671"},"message":"Just commenting out some problematic material","distinct":false,"url":"https://api.github.com/repos/GCSShatteredSpace/Main-Working-Repository/commits/175f2111053e679dd173ebe223ac9ba2cbde4c79"},{"sha":"def934f0afbc18aa000456fb7cae6ee52b0b6706","author":{"email":"9369460c211b322f530f9d19ecab5f34cccdcf84@gmail.com","name":"diemoldau"},"message":"Merge remote-tracking branch 'refs/remotes/origin/davidzeng'","distinct":false,"url":"https://api.github.com/repos/GCSShatteredSpace/Main-Working-Repository/commits/def934f0afbc18aa000456fb7cae6ee52b0b6706"},{"sha":"f4305b0a8caef9146f5d6ed48cde1a75a409370e","author":{"email":"9369460c211b322f530f9d19ecab5f34cccdcf84@gmail.com","name":"diemoldau"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tShatteredSpace/ProjectSettings/ProjectSettings.asset\n\tShatteredSpace/ProjectSettings/ProjectVersion.txt","distinct":false,"url":"https://api.github.com/repos/GCSShatteredSpace/Main-Working-Repository/commits/f4305b0a8caef9146f5d6ed48cde1a75a409370e"},{"sha":"881ad9b54781e225710f094f9d68d3b86fafa7e1","author":{"email":"9369460c211b322f530f9d19ecab5f34cccdcf84@gmail.com","name":"diemoldau"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into davidzeng","distinct":true,"url":"https://api.github.com/repos/GCSShatteredSpace/Main-Working-Repository/commits/881ad9b54781e225710f094f9d68d3b86fafa7e1"}]}