Git diff reporter now handles merge conflict format of diff
Updated CHANGELOG
Merge pull request #40 from Julian/master

Add 2.6 Support
Merge pull request #43 from edx/will/handle-merge-conflicts

Git diff reporter now handles merge conflict format of diff
Fixed a bug that would cause combined reports to always be 100% covered

Conflicts:
	diff_cover/violations_reporter.py
Merge pull request #45 from edx/will/fix-combined-input-bug

Fixed a bug that would cause combined reports to always be 100% covered
Incremented to v0.2.2, updated CHANGELOG