CarJuice/CarJuice — pull request #6 by dperjar (2012-04-26 01:45:48+00:00)
Title: Trying to add the new classes

I think, stupidly enough, that the conflict with main.xml was a line break at the end of the file on CarJuice/CarJuice. Tried to get rid of it, now trying this.