Performed an exorcism on the acceleramerator (Figured out the problem, that the getting single axis doesn't work properly because reasons)
Merge branch 'master' of https://github.com/adlasa/Robotics

Conflicts:
	2014Competition/src/edu/wpi/first/wpilibj/templates/RobotTemplate.java