{"push_id":1315630896,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"5b195f9917e05f8268014e84c1a89a6e88bdd5a2","before":"7e11fb01c109981f9323ca0d7bcd9305bdad0aeb","commits":[{"sha":"877a2003a37ac8f8adc161ead328507ee1c495ae","author":{"name":"Ben Shumway","email":"dc205f7ccfda543b8b126b1f4dea7913bbf40489@gmail.com"},"message":"Worked on getting combat timed","distinct":true,"url":"https://api.github.com/repos/Code-Ergo-Sum/SE2-SDS/commits/877a2003a37ac8f8adc161ead328507ee1c495ae"},{"sha":"5b195f9917e05f8268014e84c1a89a6e88bdd5a2","author":{"name":"Ben Shumway","email":"dc205f7ccfda543b8b126b1f4dea7913bbf40489@gmail.com"},"message":"Merge remote-tracking branch 'origin/master'\n\n# Conflicts:\n#\tTB-RPG/.vs/TB-RPG/v14/.suo\n#\tTB-RPG/Assets/Combat.cs\n#\tTB-RPG/Assets/MainScene.unity\n#\tTB-RPG/Library/CurrentLayout.dwlt\n#\tTB-RPG/Library/CurrentMaximizeLayout.dwlt\n#\tTB-RPG/Library/ScriptAssemblies/Assembly-CSharp.dll\n#\tTB-RPG/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb\n#\tTB-RPG/Library/assetDatabase3\n#\tTB-RPG/Library/expandedItems\n#\tTB-RPG/Library/metadata/00/00000000000000004000000000000000\n#\tTB-RPG/Library/metadata/00/00000000000000006100000000000000\n#\tTB-RPG/Library/metadata/fc/fcb9241e87a1f424191d6ed7eb7e8502\n#\tTB-RPG/TB-RPG.CSharp.csproj","distinct":true,"url":"https://api.github.com/repos/Code-Ergo-Sum/SE2-SDS/commits/5b195f9917e05f8268014e84c1a89a6e88bdd5a2"}]}
{"actor":{"display_login":"Code-Ergo-Sum"}}