Error Resolution

Avoiding broken code when Uploading during testing
Error Resolution

Avoiding broken code when Uploading during testing
Resolving XML conflict
Merge branch 'master' of https://github.com/frc3946/AerialAssist.git

Conflicts:
	AerialAssist/src/edu/wpi/first/wpilibj/templates/RobotMap.java
Error Resolution

Avoiding broken code when Uploading during testing