Fail
Merge branch 'master' of https://github.com/matthkowa/GL2.git

Conflicts:
	src/initialNode/Administrateur.java