vet ikke
Merge remote-tracking branch 'origin/master'

Conflicts:
	Workspace/DynamixelControl/bin/dxl_control/Test.class
	Workspace/DynamixelControl/src/dxl_control/Test.java