dat setup.mk
changed port number
joystick control
Merge branch 'master' of github.com:BellaireRobotics/aerbot-tester
intake pneumatic
changed back setup.mk for pull requesting
toggle shooter pneumatic
more like frc controls
Merge branch 'master' of https://github.com/LoadingPleaseWait/aerbot-tester into LoadingPleaseWait-master

Conflicts:
	vexuser.c