Massa and Turning testV1
Renamed demo programs to Master Controller V1
Renamed demo project to Master Contrller v1
Merge branch 'Jon' of https://github.com/amccaleb/UCSC-Rover-2014 into Jon

Conflicts:
	trunk/Software/MPLABX/Projects/EncoderJon_v1/nbproject/Makefile-genesis.properties
	trunk/Software/MPLABX/Projects/EncoderJon_v1/nbproject/private/private.xml
	trunk/Software/MPLABX/Projects/Turning_Test_v1/nbproject/Makefile-genesis.properties
	trunk/Software/MPLABX/Projects/Turning_Test_v1/nbproject/private/private.xml

bad merge?
good commit