Fixing prediction time for aiming.
Update margin tolerance
Merge pull request #23 from Wxalex98/shoot

Updating the aim algorithm
Adding new strategy selector
Adding PHASE2_STRATEGY macros