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(){
 

src/pages/VisProgPage/VisProg.tsx

@@ -1,13 +1,3 @@
-<<<<<<< HEAD
-import VisProgUI from "../../visualProgrammingUI/VisProgUI.tsx";
-
-function VisProgPage() {
-    return (
-        <>
-            <VisProgUI />
-        </>
-    )
-=======
 import {
   Background,
   Controls,
@@ -144,7 +134,6 @@ function VisProgPage() {
       <VisualProgrammingUI/>
     </>
   )
->>>>>>> origin/dev
 }
 
 export default VisProgPage