The new code for Waterloo

Added Two ball auto
Removed unused code
Merge branch 'master' of https://github.com/RenaissanceRobotics/AerialAssist

Conflicts:
	nbproject/private/private.xml
	src/edu/wpi/first/wpilibj/templates/DualDriver.java
	src/edu/wpi/first/wpilibj/templates/Options.java
	src/edu/wpi/first/wpilibj/templates/Robot.java