things have started working, but some conflicts are being duplicated.
Merge pull request #8 from GoBoundless/refactor_strings_working

things have started working, but some conflicts are being duplicated.
working on writing specs and fixing them.
Merge pull request #9 from GoBoundless/refactor_strings_working

working on writing specs and fixing them.
wrote a bunch of tests and cleaned up differ.
Merge pull request #10 from GoBoundless/refactor_strings_working

wrote a bunch of tests and cleaned up differ.
refactoring is completed unless people thing more is needed (more is probably possible). Also renamed a bunch of variables for readability.
Merge pull request #11 from GoBoundless/refactor_strings_working

refactoring is completed unless people thing more is needed
updated version number
made changes to return a string if there are no conflicts
Merge pull request #12 from GoBoundless/refactor_strings_working

Refactor strings working
on the way to actually integrating this into versioned_record
conflict detection is broken.  looking at diff now.
found bug in differ, the test on line 150 fails
found and fixed bug in the case where the beginning of text doesn't match
all tests are passing
Merge pull request #13 from GoBoundless/refactor_strings_working

Refactor strings working
changed output to be consistent
Merge pull request #14 from GoBoundless/refactor_strings_working

changed output to be consistent
small change to fix errors when trying to merge 3 empty strings