merge branch dev into show-connected-robots pt2

src/App.tsx

@@ -4,11 +4,8 @@ import './App.css'
 import TemplatePage from './pages/TemplatePage/Template.tsx'
 import Home from './pages/Home/Home.tsx'
 import Robot from './pages/Robot/Robot.tsx';
-<<<<<<< HEAD
 import ConnectedRobots from './pages/ConnectedRobots/ConnectedRobots.tsx'
-=======
 import VisProg from "./pages/VisProgPage/VisProg.tsx";
->>>>>>> origin/dev
 
 function App(){