Added test case for @@ symbol at the end of the hunk line.
Changed parsing of hunk line into two steps; a split on @@ symbols,
then using a regex to get the start line number.
Added clarifying comments about hunk lines
Merge pull request #12 from edx/will/fix-parse-error

Updated regular expression parsers to fix a parse error
Updated to version 0.1.3
Merge branch 'master' into will/inter-diff-conflicts

Conflicts:
	CHANGELOG