{"shas":[["e8243b356f84868862f20c1863fadd7d1afbd7e6","26aa0c16cba4e81abe4218bd30721b71cdad55af@mail.missouri.edu","Merge remote branch 'upstream/master'\n\nConflicts:\n\tmodel/Customization.php\n\tmodel/Order.php","StuartFeldt"],["0cabe9e1fab24469d6242377671bf1785a7c9a8f","26aa0c16cba4e81abe4218bd30721b71cdad55af@mail.missouri.edu","Edited model/Order.php via GitHub","Stuart Feldt"]],"repo":"rockerest/capstone","actor":"rockerest","ref":"refs/heads/master","size":2,"head":"0cabe9e1fab24469d6242377671bf1785a7c9a8f","actor_gravatar":"8361ba9354d54301d67cf2d0ded0f504","push_id":27392321}