Pre
ProperCode
Merge origin/master

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

Conflicts:
	build.xml
	resources/META-INF/MANIFEST.MF
Commit
Commit
Added new autonomous package and just created findRetrotape
"fixing" stuff
Merge origin/master

Conflicts:
	build.xml
	resources/META-INF/MANIFEST.MF
Merge origin/master

Conflicts:
	build.xml
	resources/META-INF/MANIFEST.MF
Did visionTracking interface and subsystem. Created the class
Merge origin/master
Merge origin/master

Conflicts:
	build.xml
	resources/META-INF/MANIFEST.MF
created findHotLights, will be looking for the yellow lgihts
Did more Vision tracking
Added retroLight subsystem and some comments
Merge origin/master
added gyro
Merge origin/master
Merge origin/master