Changed "conflicts" string to "results"
Merge branch 'master' of https://github.com/fireundubh/md5gen.git