Fixed conflicts.
tree46a9f69e5b6aed73fb6f6fc62f2c7ab35faf448d
-rw-r--r-- 5 .gitignore
-rw-r--r-- 1865 build.xml
drwxr-xr-x - lib
drwxr-xr-x - maps
drwxr-xr-x - rapport
drwxr-xr-x - src
drwxr-xr-x - test