fiddler-crabs-2014/thedelta — pull request #40 by plondon (2014-05-25 19:11:27+00:00)
Title: fix merge conflicts

need to figure out gitignore to get rid of log and coverage files