Added smart dashboard to shooter
fix merge conflicts