Git diff reporter now handles merge conflict format of diff
Updated CHANGELOG
Merge pull request #43 from edx/will/handle-merge-conflicts

Git diff reporter now handles merge conflict format of diff
Merge branch 'master' into will/src-snippets

Conflicts:
	CHANGELOG
	diff_cover/tests/test_diff_reporter.py