GitHub PushEvent at 2014-01-04 17:02:51
Repository: booksmart1
Actor: elliotanderson13
Payload: {"shas":[["610112f6d7578598c794b07c4f8ec27e7325aa11","ac490a691c732b79788805b3413e0bba18dd2e05@Elliots-MacBook-Pro.local","nothing","elliotanderson13",true],["e09bd887d92d5fa80e14218165237661827ded4d","ac490a691c732b79788805b3413e0bba18dd2e05@Elliots-MacBook-Pro.local","Merge branch 'master' of https://github.com/elliotanderson13/booksmart1\n\nConflicts:\n\tvendor/autoload.php\n\tvendor/composer/autoload_classmap.php\n\tvendor/composer/autoload_real.php","elliotanderson13",true]],"size":2,"ref":"refs/heads/master","head":"e09bd887d92d5fa80e14218165237661827ded4d"}