Test
Clean
Test
Merge remote-tracking branch 'origin/AlexandreSP'
Clean
Merge remote-tracking branch 'origin/AlexandreSP'
Kikou
Test
Rebase
Kikou 2.0
Test
grr
Lol
Merge branch 'Goudacraft' of https://github.com/Goudacraft/FTP into AlexandreSP

Conflicts:
	src/fr/Gouda/FTP/Frame.java
Merge branch 'AlexandreSP' of https://github.com/Goudacraft/FTP into AlexandreSP
Enlener la merde d'elie