Licorne pour Bobby
Merge branch 'master' of https://github.com/Shadowere/Lab1
sdfegs
Merge remote-tracking branch 'origin/master'

Conflicts:
	Squelette-lab1/.classpath
	Squelette-lab1/application/ListeChainee.java
	Squelette-lab1/bin/.gitignore