Code the night before shore wood

Changes:
* Added catch preset
* Changed one ball autonomous to drive for .6 seconds and use high gear
Merge conflicts
Accidentally kept "<<<<< HEAD" around