Tentative de commit.
super biatch
Merge branch 'master' of https://github.com/FredericKtan/IK3-Projet-JAVA

Conflicts:
	README
	conversion.java
ALRS BITCH ???