modify makefile
modify loop
Merge branch 'TotalStation'

Conflicts:
	src/test/main.cpp