Well, this is the PID controller modified and the triangle. I'm not sure if the triangle will work, I need to make some tests :)
PID changed, and triangle done but not sure if this will work

Merge branch 'master' of https://github.com/robotics-silver-surfer/surfer-main

Conflicts:
	lab2/angPos_PID/bin/angPos_PID
	lab2/angPos_PID/build/CMakeFiles/CMakeRuleHashes.txt
	lab2/angPos_PID/build/CMakeFiles/angPos_PID.dir/CXX.includecache
	lab2/angPos_PID/build/CMakeFiles/angPos_PID.dir/build.make
	lab2/angPos_PID/build/CMakeFiles/angPos_PID.dir/depend.internal
	lab2/angPos_PID/build/CMakeFiles/angPos_PID.dir/depend.make
	lab2/angPos_PID/build/CMakeFiles/angPos_PID.dir/src/angPos_PID.cpp.o
	lab2/angPos_PID/build/catkin_generated/installspace/setup.bash
	lab2/angPos_PID/build/devel/setup.bash
	lab2/arbitrator/build/CMakeFiles/CMakeRuleHashes.txt
	lab2/arbitrator/build/CMakeFiles/ROSBUILD_genmsg_cpp.dir/build.make
	lab2/arbitrator/build/CMakeFiles/ROSBUILD_genmsg_lisp.dir/build.make
	lab2/arbitrator/build/CMakeFiles/ROSBUILD_genmsg_py.dir/build.make
	lab2/arbitrator/build/devel/setup.sh
	lab2/cereal_port/build/CMakeFiles/CMakeRuleHashes.txt
	lab2/cereal_port/build/devel/setup.sh
	lab2/hoverboard/build/CMakeFiles/CMakeRuleHashes.txt
	lab2/hoverboard/build/CMakeFiles/ROSBUILD_genmsg_cpp.dir/build.make
	lab2/hoverboard/build/CMakeFiles/ROSBUILD_genmsg_lisp.dir/build.make
	lab2/hoverboard/build/CMakeFiles/ROSBUILD_genmsg_py.dir/build.make
	lab2/hoverboard/build/devel/setup.sh
	lab2/hovercraft/build/CMakeFiles/CMakeRuleHashes.txt
	lab2/hovercraft/build/CMakeFiles/ROSBUILD_genmsg_cpp.dir/build.make
	lab2/hovercraft/build/CMakeFiles/ROSBUILD_genmsg_lisp.dir/build.make
	lab2/hovercraft/build/CMakeFiles/ROSBUILD_genmsg_py.dir/build.make
	lab2/hovercraft/build/devel/setup.sh
	lab2/reactivecontrol/build/CMakeCache.txt
	lab2/reactivecontrol/build/CMakeFiles/test-results.dir/build.make
	lab2/reactivecontrol/build/devel/setup.sh
	lab2/rxtx/build/CMakeFiles/CMakeRuleHashes.txt
	lab2/rxtx/build/devel/setup.sh
	lab2/thrusterMapping/scripts/thrusterMapping.py