Merge branch 'master' of /home/kimsavinfo/git/Projet-crypto3 with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml

TODO :
Triangulare > UncryptTriangle = clean