Conflicts:
	stm32/include/position.h
	stm32/src/main.cpp
	stm32/src/position.cpp
	stm32/src/simul/table.cpp
	stm32/src/strategie/krabi2015.cpp
	stm32/src/strategie/strategieV2.cpp
	stm32/src/strategie/strategiev3.cpp
	stm32/src/strategie/tapis.cpp