Fixes merge conflict
Merge pull request #481 from emamanto/master

Awesome Goalie/General Improvements
Improves STAND_UP_BACK and GOALIE_SQUAT
Merge remote-tracking branch 'northern-bites/master'
Reverts KickerStates.py to old state
Makes tracker able to track a field object.
Also need these changes for tracking.
Fix for the headtracker thing.
Some improvements to goalie details.
Major goalie improvements: gets back from penalty okay-ish.