peshkira/c3po — pull request #40 by luis100 (2013-03-22 12:48:07+00:00)
Title: Bug fixing and travis CI integration

It solves a bug when conflicted properties have only one value. Integrates with Travis CI and adds the build status to the README.