Merge branch 'master' of /home/sylvain/IdeaProjects/Persons_Comparator with conflicts.
-rw-r--r-- 2755 .gitignore
drwxr-xr-x - .idea
-rw-r--r-- 484 Persons_Comparator.iml
drwxr-xr-x - data
drwxr-xr-x - lib
drwxr-xr-x - src