blabla
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/.gitignore
Merge branch 'master' of https://github.com/lsinf1121-groupe3-2/mission2