Merge pull request #1 from jcolosi/master

Adding a Java program to merge, sort, normalize, and make unique.
comment out strings that are too long.
Removed duplicate entries
Removed duplicate entries
Merge pull request #2 from McAnix/master

Duplicate entries
added México
Merge remote-tracking branch 'upstream/master'