System that was running on surface 9/21/2014
Merge branch 'kbrennan' of https://github.com/CMU-Robotics-Club/RoboBuggy into kbrennan

Conflicts:
	surface_src/VisionSystem/Debug/src/VisionSystem.o