{"shas":[["c53b0e25490e85847425c9a1dc2eac7e922cc69b","1ca42dded9a30268253bc945f547508f60b59abd@gmail.com","Merge branch 'master' of github.com:prog694/frc\n\nConflicts:\n\tdesdroid/src/stuy/ArmController.java","Blake Elias"]],"repo":"prog694/frc","actor":"blakeelias","ref":"refs/heads/master","size":1,"head":"c53b0e25490e85847425c9a1dc2eac7e922cc69b","actor_gravatar":"ead9ea690faaa539c2e96deb607d6e44","push_id":25821234}