Modification de l'algo gendarme board
Merge branch 'master' of github.com:NiarK/Omicron

Conflicts:
	controller/boardcontroller.h
lol
Merge branch 'master' of github.com:NiarK/Omicron
Modification de l'algo de la board
Merge branch 'master' of github.com:NiarK/Omicron

Conflicts:
	controller/boardcontroller.cpp