Add second URL for git-imerge
Merge pull request #17 from mhagger/master

Add second URL for git-imerge