New proto, to fix bugs
Merge branch 'master' of https://github.com/ligerbots/DriveProto

Conflicts:
	BSD_License_for_WPILib_code.txt
	build.properties
	nbproject/project.bak.xml
	nbproject/project.xml
	resources/META-INF/MANIFEST.MF