Added Copy Rights to OI.java. Please help but do not Commit and Push untill told otherwise.
We mapped out the dStick with all of the buttons featured on the whiteboard. #Harry&Supica
Merge branch 'origin/JoystickbuttonOI'

Conflicts:
	src/edu/wpi/first/wpilibj/templates/OI.java
	src/edu/wpi/first/wpilibj/templates/RobotMap.java

Consolidated a few different efforts that students are working on.