Brandon shoving code
Done merging
Merge branch 'master' of https://github.com/amccaleb/UCSC-Rover-2014

Conflicts:
	git-pull.sh
	trunk/Software/linux/RoverControl/RoverControl
	trunk/Software/linux/RoverControl/RoverControlJon
	trunk/Software/linux/TestPrograms/WinterCheckoff/DStarPath.cpp~
	trunk/Software/linux/modules/Communication/msg_prot_test
	trunk/Software/linux/modules/ImgProc/ImgProcUnderTest
Added laptop reset program edited, unofrontback_v2 calibration for
checkoff
Merged
Merge branch 'master' of https://github.com/amccaleb/UCSC-Rover-2014

Conflicts:
	trunk/Software/MPLABX/Projects/UnoFrontBack_v2/nbproject/Makefile-genesis.properties
	trunk/Software/MPLABX/Projects/UnoFrontBack_v2/nbproject/Makefile-local-UNO32.mk
	trunk/Software/MPLABX/Projects/UnoFrontBack_v2/nbproject/configurations.xml
	trunk/Software/MPLABX/Projects/UnoFrontBack_v2/nbproject/private/configurations.xml
	trunk/Software/linux/RoverControl/RoverControlJon