GitHub PushEvent at 2014-12-17 19:25:48
Repository: lindstrom_life
Actor: evlkls
Payload: {"shas":[["52e5525c6c77ccd3cb6f8b9741b96d1b147aff78","eecb41a0a37438174b26813bfcb1fa5f7bf5a4e9@byui.edu","Merge origin/master\n\nConflicts:\n\tREADME.md\n\tbuild.xml\n\tnbproject/build-impl.xml\n\tnbproject/genfiles.properties\n\tnbproject/project.properties\n\tnbproject/project.xml","evlkls",true]],"size":1,"ref":"refs/heads/master","head":"52e5525c6c77ccd3cb6f8b9741b96d1b147aff78"}