Finished up RMotor and a few accompanying methods
Merge branch 'master' of https://github.com/discobots2587/disco-frc

Conflicts:
	2014-AerialAssist/HolonomicPractice/Holonomic/holonomic/nbproject/project.bak.xml
	2014-AerialAssist/HolonomicPractice/Holonomic/holonomic/src/robot/OI.java
	2014-AerialAssist/HolonomicPractice/Holonomic/holonomic/src/robot/commands/Changepower.java
	2014-AerialAssist/HolonomicPractice/Holonomic/holonomic/src/robot/commands/Changetime.java
	2014-AerialAssist/HolonomicPractice/Holonomic/holonomic/src/robot/subsystems/Drivetrain.java
Fixed angle for Aerial Assist
Merge branch 'master' of https://github.com/discobots2587/disco-frc

Conflicts:
	2014-AerialAssist/AerialAssist/src/org/discobots/aerialassist/subsystems/Drivetrain.java