Code at 9:33AM 2-15-14
Code at 10:31AM 2-15-14
Code at 10:54AM 2-15-14
Merge branch 'feature/Shooter-PID' into develop
Update .gitignore
Merge branch '57_Simple_Autonomous' of https://github.com/prosa100/2022-FRC-2014 into develop
sketch changes to make arm move manually
Merge pull request #60 from prosa100/feature/manual-arm

Feature/manual arm