Update Unicode Conflicted Filenames (Fixes #96)
Merge pull request #109 from Polytonic/unicode

Update Unicode Conflicted Filenames (Fixes #96)