GitHub PushEvent at 2014-12-01 18:50:51
Repository: scootlife
Actor: MercenaryMcCloud
Payload: {"shas":[["f99f3369f16e77e471d9ba5055ba812046aa3fe6","e06a95b72ee26ce203f32c6ac0766909772f4d93@my.uwstout.edu","checkboxes repaired and buttons","MercenaryMcCloud",true],["d4425fbd77b4f54dbdd19711f24256611390ef59","e06a95b72ee26ce203f32c6ac0766909772f4d93@my.uwstout.edu","Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tsrc/scripts/gameengine.js","MercenaryMcCloud",true],["224c639d7ee75bcf0602f519cd43531bdb79dad1","e06a95b72ee26ce203f32c6ac0766909772f4d93@my.uwstout.edu","conflict resolution","MercenaryMcCloud",true],["4cb93514bebad3954c476b544cafead1922e80fa","e06a95b72ee26ce203f32c6ac0766909772f4d93@my.uwstout.edu","Merge branch 'master' of https://github.com/Tukajo/scootlife","MercenaryMcCloud",true]],"size":4,"ref":"refs/heads/master","head":"4cb93514bebad3954c476b544cafead1922e80fa"}