some changes
Merge https://github.com/ProjetM1MPRI2013/central
some modifications
:
	code/src/main.cc
Merge https://github.com/ProjetM1MPRI2013/central