changes today
Merge pull request #10 from SharmaNikhil/master

calcPosX()/calcPosY()
Changes
Change
stuffMerge branch 'master' of https://github.com/JeffTolbert/FTC-Team4592-2012

Conflicts:
	SmartAutonomous/Cyborggoodstuff.c
changes
changes
THIS WILL WORK as long as the raw values are consistant within a reasonable range
Merge pull request #11 from AlexMaxseiner/master

stuff to fix
Line Follow Stuff
Merge branch 'master' of https://github.com/JeffTolbert/FTC-Team4592-2012 into testArea

Conflicts:
	SmartAutonomous/Cyborggoodstuff.c
Merge branch 'testArea'

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