Fixing What the Merge Messed Up

The shooter and main robot file should all work properly now