Ok
ok
ok

Merge branch 'master' of https://github.com/Fireaxe/GroupeConnards

Conflicts:
	.idea/workspace.xml