Adding includes to PID.h for slamming brakes
Slamming brakes on drive motors.
Merge branch 'master' of https://github.com/amccaleb/UCSC-Rover-2014.git
Merge branch 'master' of https://github.com/amccaleb/UCSC-Rover-2014.git
Everything in minimal working state for video to NASA (micro side).
Merge branch 'master' of https://github.com/amccaleb/UCSC-Rover-2014

Conflicts:
	trunk/Software/MPLABX/Projects/TestingSampleCollector/nbproject/Makefile-genesis.properties
	trunk/Software/MPLABX/srcRover/PID.c