Prototypical Climbing arm angle adjustment
Merge branch 'master' of https://github.com/frc3946/UltimateAscent

Conflicts:
	src/org/usfirst/frc3946/UltimateAscent/OI.java