a
Merge branch 'master' of https://github.com/iarczi/elektron_robot

Conflicts:
	elektron_base/bin/elektron_base_node
	elektron_base/build/CMakeCache.txt
	elektron_base/build/CMakeFiles/CMakeDirectoryInformation.cmake
	elektron_base/build/CMakeFiles/CMakeOutput.log
	elektron_base/build/CMakeFiles/CMakeRuleHashes.txt
	elektron_base/build/CMakeFiles/CMakeSystem.cmake
	elektron_base/build/CMakeFiles/Makefile.cmake
	elektron_base/build/CMakeFiles/Makefile2
	elektron_base/build/CMakeFiles/ROSBUILD_genmsg_cpp.dir/build.make
	elektron_base/build/CMakeFiles/ROSBUILD_genmsg_lisp.dir/build.make
	elektron_base/build/CMakeFiles/ROSBUILD_gensrv_cpp.dir/build.make
	elektron_base/build/CMakeFiles/ROSBUILD_gensrv_lisp.dir/build.make
	elektron_base/build/CMakeFiles/TargetDirectories.txt
	elektron_base/build/CMakeFiles/elektron_base_node.dir/C.includecache
	elektron_base/build/CMakeFiles/elektron_base_node.dir/CXX.includecache
	elektron_base/build/CMakeFiles/elektron_base_node.dir/DependInfo.cmake
	elektron_base/build/CMakeFiles/elektron_base_node.dir/build.make
	elektron_base/build/CMakeFiles/elektron_base_node.dir/cmake_clean.cmake
	elektron_base/build/CMakeFiles/elektron_base_node.dir/depend.internal
	elektron_base/build/CMakeFiles/elektron_base_node.dir/depend.make
	elektron_base/build/CMakeFiles/elektron_base_node.dir/flags.make
	elektron_base/build/CMakeFiles/elektron_base_node.dir/link.txt
	elektron_base/build/CMakeFiles/elektron_base_node.dir/progress.make
	elektron_base/build/CMakeFiles/rosbuild_precompile.dir/build.make
	elektron_base/build/CMakeFiles/rosbuild_premsgsrvgen.dir/build.make
	elektron_base/build/CMakeFiles/rospack_genmsg.dir/build.make
	elektron_base/build/CMakeFiles/rospack_genmsg_libexe.dir/build.make
	elektron_base/build/CMakeFiles/rospack_gensrv.dir/build.make
	elektron_base/build/CMakeFiles/test-future.dir/build.make
	elektron_base/build/CMakeFiles/test-results-run.dir/build.make
	elektron_base/build/CMakeFiles/test-results.dir/build.make
	elektron_base/build/CMakeFiles/test.dir/build.make
	elektron_base/build/CMakeFiles/tests.dir/build.make
	elektron_base/build/Makefile
	elektron_base/build/cmake_install.cmake
	elektron_monitor/build/CMakeCache.txt
	elektron_monitor/build/CMakeFiles/CMakeOutput.log
	elektron_monitor/build/CMakeFiles/CMakeSystem.cmake
	elektron_sensors/build/CMakeCache.txt
	elektron_sensors/build/CMakeFiles/CMakeOutput.log
	elektron_sensors/build/CMakeFiles/CMakeSystem.cmake