Merge branch 'Alex' into 'main'

webstillas/.idea/webstillas.iml

webstillas/package-lock.json

webstillas/package.json

webstillas/public/index.html

webstillas/src/App.js

webstillas/src/components/mapPage/mapPage.css

webstillas/src/components/mapPage/mapPage.js

...src/components/mapPage/mapbox-marker-icon-20px-orange.png

...illas/src/components/projects/elements/AK_SPI_0_01100.png

webstillas/src/components/projects/elements/card.css

webstillas/src/components/projects/elements/card.js

webstillas/src/components/projects/elements/preView.css

webstillas/src/components/projects/elements/preView.js

webstillas/src/components/projects/images/stillas.jpg

webstillas/src/components/projects/projects.css

webstillas/src/components/projects/projects.js

...s/src/components/scaffolding/elements/scaffoldingCard.css

...as/src/components/scaffolding/elements/scaffoldingCard.js

webstillas/src/components/scaffolding/elements/sideBar.css

webstillas/src/components/scaffolding/elements/sideBar.js