Changed all instances of four spaces to five spaces, deleted semicolons, changed all lowercase to capitals and vise-versa, all instances of "'s are now <'s, and finally, removed Herobrine -Brian Troung
Merge branch 'master' of github.com:anidev/612-2013
Merge branch 'master' of github.com:anidev/612-2013
Vision needs some work, due to our vision needing the coordinates of the bounding boxes.
Autonomou had several compile errors
Merge branch 'master' of github.com:anidev/612-2013
(this is definitely a glitch) *sigh*
Conflicts:
	states/state_driving.cpp
edited deadzone
Merge branch 'master' of github.com:anidev/612-2013
Merge branch 'master' of github.com:anidev/612-2013
Changes
Merge pull request #80 from JeffTolbert/master

Some Changes And Tasks
Merge branch 'master' of github.com:anidev/612-2013

Conflicts:
	612.h
	joysmooth.cpp
added feeder counter
Shooter changes
Merge branch 'master' of github.com:anidev/612-2013
jeff's fix
Merge pull request #79 from swarage/master

Added Deadzones
added IR sensor test code (note, this is just for getting values. The Logic is there as a placeholder (sorry).
Minor Things
Fixes launcher hall effect by adding SetMaxPeriod
Fixes Test link errors and adds feeder test printf