Merge pull request #1 from leroux/master

Shooter Capabilities
Btn5U toggles a pneumatic relay and the left joystick's y axis will also control the motor
Merge pull request #3 from LoadingPleaseWait/master

Btn5U toggles a pneumatic relay and the left joystick's y axis will also...
apollo
correct apollo code
Merge pull request #4 from LoadingPleaseWait/master

Apollo Implementation
Merge pull request #5 from LoadingPleaseWait/master

fixed pneumatic
fixxed pneumatic
changed delay to 300 ms
Merge pull request #6 from LoadingPleaseWait/master

changed delay to 300 ms
changed delay to 50 ms
toggle test
Merge branch 'master' of github.com:BellaireRobotics/aerbot-tester

Conflicts:
	vexuser.c
back to a normal state after merge
this button layout is the layout for frc
update .gitignore
Merge pull request #7 from LoadingPleaseWait/master

Controls are the similar to the frc controls.
reverted setup.mk
dat setup.mk
changed port number