renamed roll to roll forward and started working on it. not fineshed yet.
Merge branch 'origin/master'
Got rid of Alex's "Drive Choo Choo Train"
Rename RollForward to RetirievalRoller. Added RobotMap to Roller.
Issue #25
Merge branch 'origin/Feature-Roller'

Conflicts:
	src/edu/wpi/first/wpilibj/templates/subsystems/DriveTrain.java
Merge pull request #29 from CarmelRobotics/Feature-Roller

Feature roller