{"push_id":877774361,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"a62650a52138866f1a8ecbb3a76d9551a8fd0473","before":"4cea2fef1c548698fc75c80b5894c135606358ba","commits":[{"sha":"931dcbed2d8e0e5f8e42279af0981fa4c67e849d","author":{"email":"420bea7e865d127b1a18e7982e47d8e00a4e4424@student.aau.dk","name":"Kagemann"},"message":"Added Resource deck, updated Development deck+enum, and corrected all names of resources.","distinct":true,"url":"https://api.github.com/repos/Kagemann/PCSS_GameClient/commits/931dcbed2d8e0e5f8e42279af0981fa4c67e849d"},{"sha":"a62650a52138866f1a8ecbb3a76d9551a8fd0473","author":{"email":"420bea7e865d127b1a18e7982e47d8e00a4e4424@student.aau.dk","name":"Kagemann"},"message":"Merge remote-tracking branch 'origin/master'\n\n# Conflicts:\n#\tsrc/Player.java","distinct":true,"url":"https://api.github.com/repos/Kagemann/PCSS_GameClient/commits/a62650a52138866f1a8ecbb3a76d9551a8fd0473"}]}