added the stuff from imagePID and the encoders
Mergebranch dev_diskShooter into testing_imagePID

Conflicts:
	nbproject/project.bak.xml
	nbproject/project.xml
	src/com/shsrobotics/omicronsquark/Maps.java
	src/com/shsrobotics/omicronsquark/commands/CommandBase.java
	src/com/shsrobotics/omicronsquark/subsystems/DiskShooter.java