jclouie/Jammy — pull request #2 by jcytong (2012-10-13 04:04:25+00:00)
Title: Let's see how a conflict can be resolved

Isn't GitHub just good at conflict resolution