rbeagrie/2014-08-26-cam — pull request #1 by takluyver (2014-08-16 01:20:46+00:00)
Title: Add illustration of VCS conflicts

I think this will help students follow the conflicts section of the lesson.