idk
Merge https://www.github.com/JeffTolbert/FTC-Team4592-2012

Conflicts:
	Teleop.c
Necessary
Merge branch 'master' of https://github.com/JeffTolbert/FTC-Team4592-2012
changes from last night
new changes
Merge pull request #9 from AlexMaxseiner/master

changes from last night
change
Structures are fun!!!!
Functions
Merge branch 'master' of https://github.com/SharmaNikhil/FTC-Team4592-2012

Conflicts:
	SmartAutonomous/Cyborggoodstuff.c
	SmartAutonomous/main.c