Merge de Shawn-David Merrifield le 15/10/2014
licorne
Merge branch 'master' of https://github.com/Shadowere/Lab1

Conflicts:
	Squelette-lab1/.classpath
	Squelette-lab1/IDLogger