merge from RB100
Merge branch 'master' of https://github.com/GCRobotics/GCRepo

Conflicts:
	GCRobotics/bin/motorControlNode
	GCRobotics/build/CMakeCache.txt
	GCRobotics/build/CMakeFiles/Makefile2
	GCRobotics/build/CMakeFiles/ROSBUILD_genmsg_cpp.dir/build.make
	GCRobotics/build/CMakeFiles/ROSBUILD_genmsg_lisp.dir/build.make
	GCRobotics/build/CMakeFiles/ROSBUILD_genmsg_py.dir/build.make
	GCRobotics/build/CMakeFiles/TargetDirectories.txt
	GCRobotics/build/CMakeFiles/i2cNode.dir/build.make
	GCRobotics/build/CMakeFiles/i2cNode.dir/flags.make
	GCRobotics/build/CMakeFiles/i2cNode.dir/link.txt
	GCRobotics/build/CMakeFiles/motorControlNode.dir/CXX.includecache
	GCRobotics/build/CMakeFiles/motorControlNode.dir/build.make
	GCRobotics/build/CMakeFiles/motorControlNode.dir/depend.internal
	GCRobotics/build/CMakeFiles/motorControlNode.dir/flags.make
	GCRobotics/build/CMakeFiles/motorControlNode.dir/link.txt
	GCRobotics/build/CMakeFiles/motorControlNode.dir/src/motorControl.o
	GCRobotics/build/CMakeFiles/motorControlNode.dir/src/motorControlNode.o
	GCRobotics/src/GCRobotics/msg/__init__.pyc
	GCRobotics/src/GCRobotics/msg/_i2cData.pyc
	GCRobotics/src/GCRobotics/msg/_simpleVelocity.pyc