removed build and devel from git
Merge https://github.com/fmder/rosWS
Changed map to relative path.
Added git ignore and removed temp "*~" files
Merge branch 'master' of https://github.com/jpmerc/rosWS

Conflicts:
	custom_ros/build/custom_navigation/CMakeFiles/adcParams.dir/src/adcParams.cpp.o
	custom_ros/build/custom_navigation/CMakeFiles/gyro_calibration.dir/CXX.includecache
	custom_ros/build/custom_navigation/CMakeFiles/gyro_calibration.dir/src/gyro_calibration.cpp.o
	custom_ros/build/custom_navigation/CMakeFiles/robot_mover.dir/src/robot_mover.cpp.o
	custom_ros/devel/lib/custom_navigation/adcParams
	custom_ros/devel/lib/custom_navigation/gyro_calibration
	custom_ros/devel/lib/custom_navigation/robot_mover