plop
Merge branch 'master' of https://github.com/NirnaethArniedi/INF311

Conflicts:
	.gitignore
	TD3/src/Banque.java