All changes for testing tank turns
Merge branch 'master' of https://github.com/amccaleb/UCSC-Rover-2014

Conflicts:
	trunk/Software/linux/modules/ImgProc/cascadeDetect.cpp
Merge branch 'master' of https://github.com/amccaleb/UCSC-Rover-2014

Conflicts:
	trunk/Software/linux/modules/ImgProc/cascadeDetect.hpp
Keeping everything in repo up to date
Merge branch 'master' of https://github.com/amccaleb/UCSC-Rover-2014