Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/Main.java

diff --combined src/Origin.java
index efce11a79dc6b71678f2338afa05b8dac78e713a,c02dd28a1f4b777de433777a5e5452b8a6702f31..41b5b360d04fde925e347932b8bd01b6d4063137
--- 1/src/Origin.java
--- 2/src/Origin.java
+++ b/src/Origin.java
@@@ -1,7 -1,7 +1,7 @@@
  import java.util.ArrayList;
  import java.util.Arrays;
  
- public class Origin implements Comparable<Origin> {
+ public class Origin {
      private String continent = "Unknown";
      private String country;
      private String[] continents = {"Africa", "Americas", "Asia", "Europe", "Oceania"};
@@@ -9,11 -9,10 +9,11 @@@
              {"Mali"}, /* Africa */
              {"United States of America", "Brasil", "Mexico"}, /* Americas */
              {"India"}, /* Asia */
-             {"France", "Germany", "United Kingdom", "Belgium", "Norway"}, /* Europe */
+             {"France", "Italie", "Germany", "United Kingdom", "Belgium", "Norway"}, /* Europe */
              {"Australia"} /* Oceania */
      };
  
 +
      Origin() {
      }
  
@@@ -63,8 -62,7 +63,7 @@@
              return "Unknown";
      }
  
-     @Override
-     public int compareTo(Origin origin) {
+     public int distanceTo(Origin origin) {
          return 0;
      }
  }