#4: Re-encode all files into UTF-8, to match GitHub display.
Merge remote-tracking branch 'origin/HEAD'