Update .gitignore
Update .gitignore
Merge origin/maxime into maxime
Delete Run.java
Merge origin/maxime into maxime
Delete pom.xml
Merge origin/gael into gael

Conflicts:
	.gitignore
Base du programme
Merge origin/dev into dev