Robot.cpp
Added kLeftbumper if statement to INC state
Added krightBumper if statement to DEC state
Merge branch 'alex'
Merge branch 'master' of https://github.com/alexbrinister/ShooterTesterCode-2013

Conflicts:
	Robot.cpp