Merge branch 'master' of C:\Users\user\IdeaProjects\MD with conflicts.
GrandEntier pas encore fait
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/src/GrandEntier.java
	src/src/TestMotBienParenthese.java
catalan done