Added GetButton for consistency with other methods in the class
Merge branch 'aerialassist' of github.com:FRC2539/command-based into aerialassist
small things I noticed and changed. still compiles
Merge branch 'aerialassist' of github.com:FRC2539/command-based into aerialassist
Using 2 channel drivebase with ControllerFactory controller configuration

Conflicts:
	Robotmap.h
Should have checked to make sure it compiled