Test add feature and remove feature merge result.

[Jefftree]

Test add feature and delete feature merge result.

This merges two branches x->d onto branch x->a where x is the base commit and d and a are the deletion and addition commits respectively.

Diff of add feature (x->a) with respect to base a: #21
Diff of delete feature (x->d) with respect to base a: #22

Branch names:
Base (x): foo-test-spaced
Addition (x->a): foo-test-spaced-add
Deletion (x->d): foo-test-spaced-delete

Trying to see if this merges cleanly

[Jefftree]

should this cleanly resolve in github?