Merge branch 'Ajay' of https://github.com/amccaleb/UCSC-Rover-2014.git
light stuff and gyro i2c
Merge branch 'master' of https://github.com/amccaleb/UCSC-Rover-2014.git

Conflicts:
	trunk/Software/MPLABX/A_practice/ObstacleDetect/nbproject/Makefile-genesis.properties
	trunk/Software/MPLABX/A_practice/ObstacleDetect/nbproject/Makefile-local-UNO32.mk
	trunk/Software/MPLABX/A_practice/ObstacleDetect/nbproject/private/configurations.xml
	trunk/Software/MPLABX/A_practice/message_protocol/nbproject/Makefile-UNO32.mk
	trunk/Software/MPLABX/A_practice/message_protocol/nbproject/Makefile-genesis.properties
	trunk/Software/MPLABX/A_practice/message_protocol/nbproject/Makefile-local-UNO32.mk
	trunk/Software/MPLABX/A_practice/message_protocol/nbproject/configurations.xml
	trunk/Software/MPLABX/A_practice/message_protocol/nbproject/private/configurations.xml
	trunk/Software/MPLABX/A_practice/message_protocol/nbproject/private/private.xml
	trunk/Software/MPLABX/A_practice/template.X/nbproject/Makefile-genesis.properties
	trunk/Software/MPLABX/srcRover/Drive.c