{"push_id":577064619,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"6d437eeec5bcf49d004900ff389ab97172648843","before":"7f8a37b4060ffddbbbae50e55cff5e3edf38d7ca","commits":[{"sha":"afb791ff868d8194045ee1944d44672d034c4377","author":{"email":"1064ad8287d1d1b047f15d0e980c1d4d80f0be52@wpi.edu","name":"jbmorse"},"message":"Yay more waves :panda_face:","distinct":true,"url":"https://api.github.com/repos/rmsantos/MQP/commits/afb791ff868d8194045ee1944d44672d034c4377"},{"sha":"6d437eeec5bcf49d004900ff389ab97172648843","author":{"email":"1064ad8287d1d1b047f15d0e980c1d4d80f0be52@wpi.edu","name":"jbmorse"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tUnity Project/Assets/Game.unity\n\tUnity Project/Library/ScriptAssemblies/Assembly-CSharp.dll\n\tUnity Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb\n\tUnity Project/Library/assetDatabase3\n\tUnity Project/Library/guidmapper\n\tUnity Project/Library/metadata/b2/b2a993aba06c3c540a2c479686ed9c82\n\tUnity Project/Unity Project-csharp.sln\n\tUnity Project/Unity Project.sln","distinct":true,"url":"https://api.github.com/repos/rmsantos/MQP/commits/6d437eeec5bcf49d004900ff389ab97172648843"}]}