Fixed a bug in which adding/deleting lines in different diff reports
would result in reports that included the deleted lines.
Merge branch 'master' into will/inter-diff-conflicts
Updated CHANGELOG
Merge branch 'master' into will/inter-diff-conflicts

Conflicts:
	CHANGELOG
Merge pull request #11 from edx/will/inter-diff-conflicts

Bug fix: Deleted lines included in report