GitHub PushEvent at 2014-12-02 04:37:04
Repository: 436-semester-project
Actor: cdavis21
Payload: {"shas":[["daac1b8637afd6dce85857e1b9d1d2848547ac80","80d37fea9adde8921d0502a8642185fbb463331a@terpmail.umd.edu","established setting of category and subcategory via dialog box.","wonder-bread",false],["a97118f942bc06b0d4173ef76d1565dcbfd78c1c","7c54b1cc6efd96c503596796ce5c3c0201b33419@yahoo.com","Merge pull request #6 from cdavis21/donutshop\n\nestablished setting of category and subcategory via dialog box.","cdavis21",false],["1a9b84d4d17b73679566203621f2c2c22f110f1a","068d5d85285d85c0ef3514ecf0ebd0dcdd63f618@Courtney-Daviss-MacBook-Pro.local","i think this worked\nMerge branch 'master' into TheHeroicBranch\n\nConflicts:\n\t.metadata/.log","cdavis21",true]],"size":3,"ref":"refs/heads/TheHeroicBranch","head":"1a9b84d4d17b73679566203621f2c2c22f110f1a"}