added in controller map for the second controller
Merge branch 'aerialassist' of github.com:FRC2539/command-based into aerialassist
Reverted back to drawback and fire instead of the command group

Conflicts:
	ControllerMap.h