GitHub PushEvent at 2014-12-16 03:36:00
Repository: project2
Actor: klinginE
Payload: {"shas":[["f80da147783bd87c78d2863a78ded82daa18e5c2","c8b723825bc626c69b52e176bded8e4a7ed6537e@live.com","Got cart to move to checkout on server.","Eric Bryan Klinginsmith",true],["bd92d711fd0343c82bb9030a766e6748273f5a7c","c8b723825bc626c69b52e176bded8e4a7ed6537e@live.com","Got server working with two carts. Needs a little work as there are\nstill some minor bugs.","Eric Bryan Klinginsmith",true],["6261e8d756ee041cdcf638c05447b21b4820b7d9","c8b723825bc626c69b52e176bded8e4a7ed6537e@live.com","Merge branch 'develop' of git@github.com:klinginE/project2.git into\ndevelop\n\nConflicts:\n\tsrc/project2/Cart.java\n\tsrc/project2/GameState.java\n\tsrc/project2/Level.java\n\tsrc/project2/MultiPlayerGameState.java\n\tsrc/project2/Player.java\n\tsrc/project2/Powerup.java\n\tsrc/project2/Server.java\n\tsrc/project2/SinglePlayerGameState.java","Eric Bryan Klinginsmith",true]],"size":3,"ref":"refs/heads/develop","head":"6261e8d756ee041cdcf638c05447b21b4820b7d9"}