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.