Intake Implementation:
IntakeMaintain added to constantly set the attention-needy Jaguars.
IntakeSwitchSolenoid and IntakeSwitchRoller implemented.
IntakeMaintain:
Files added that were untracked in the last commit by accident.
Intake Roller:

Gave intake roller CAN ID 8 and tested code.
Still says modified?
Finish IntakeImplementation

Conflicts:
	FRC_2014_Robot/FRC_2014_Robot/Commands/Compress.cpp
	FRC_2014_Robot/FRC_2014_Robot/Commands/Shift.cpp
	FRC_2014_Robot/FRC_2014_Robot/RobotMap.cpp

Lot of problems with this merge for some reason.
It decided to merge files with different names and many parts did not even merge at all. Did not delete old feature to do a manual merge by hand.
Fixing the Mess:

This commit did quite a few. Went through and fixed some of the names to match a reasonable naming convention. Also updated RobotBuilder yml file which was, for some reason, not merging properly. It is now set up so that you can export the code from RobotBuilder and build the project without having to change any of this code.

This has been tested and the following works:
Intake - Roller & Solenoid turn on and off by switch
         Roller outtakes when held
Chassis - Drives six motors in tank drive.
Shifter - Shifts low to high gear.
Compressor - Compresses to an automatic shutoff at 120 psi.
Committing again.

Still have not figured out why it makes me commit multiple times to get all the changes committed.
Missing CompressorSystem:

Putting in compressorSystem which was overlooked