smashwilson/merge-conflicts — pull request #57 by smashwilson (2014-05-28 20:46:48+00:00)
Title: [wip] Working with the React Editor.

For bonus points, I'm going to try to support the old one at the same time.