took out the potatoe:/

added an alternate autoaim vi for shooting in kanjam
Merge branch 'master' of https://github.com/FRCTeam871/2014-Robot