Add illustration of VCS conflicts
Merge pull request #1 from takluyver/illustrate-conflict

Add illustration of VCS conflicts