merging problem
Merge https://github.com/ProjetM1MPRI2013/central
thread added
Conflicts:
	code/src/main.cc
Merge https://github.com/ProjetM1MPRI2013/central