modified:   public/assignments/tp-week3.html
	new file:   public/images/ps48.jpeg

	modified:   public/assignments/tp-week3.html
	new file:   public/files/Bone_Connector_v1.f3d
	new file:   public/files/archiblox-logo.ai
	new file:   public/images/cnc-compressionbit.jpeg
	new file:   public/images/cnc-settings1.jpeg
	new file:   public/images/cnc-settings2.jpeg
	new file:   public/images/cnc-toolpath1.jpeg
	new file:   public/images/cnc-toolpath2.jpeg
	new file:   public/images/vinyl-cutter.jpeg
	new file:   public/images/vinyl-settings1.jpeg
	new file:   public/images/vinyl-settings2.jpeg

	modified:   public/images/laser-cnc-fabrication.mp4

	modified:   public/images/3d-design-print.mp4
	modified:   public/images/circuit-production.mp4

	new file:   public/images/final-demo.mp4

	new file:   public/images/circuit-production.mp4
	new file:   public/images/integrated-sytem.jpg

	modified:   public/assignments/tp-week2.html

	modified:   public/assignments/tp-week2.html
	new file:   public/files/ArchiBlox-Section.ai
	new file:   public/images/2d-1.png
	new file:   public/images/2d-2.png
	new file:   public/images/2d-3.png
	new file:   public/images/2d-4.png
	new file:   public/images/2d-5.png
	new file:   public/images/2d-6.png
	new file:   public/images/2d-7.png
	new file:   public/images/clippingsection1.jpeg
	new file:   public/images/clippingsection2.jpeg

	modified:   public/assignments/tp-week15.html
	new file:   public/images/interface-demo.mp4

	modified:   public/assignments/tp-week16.html

	modified:   public/assignments/tp-week16.html
	new file:   public/files/wildcard-quickrete-datasheet.pdf
	new file:   public/files/wildcard-quickrete-msds.pdf

	modified:   public/assignments/tp-week13.html
	new file:   public/files/crystacast_msds.pdf

	modified:   public/assignments/tp-week14.html
	new file:   public/images/archiblox-magnet-diagram.png

	modified:   public/assignments/tp-week12.html
	new file:   public/images/input1.png
	new file:   public/images/input10.png
	new file:   public/images/input2.png
	new file:   public/images/input3.png
	new file:   public/images/input4.png
	new file:   public/images/input5.png
	new file:   public/images/input6.png
	new file:   public/images/input7.png
	new file:   public/images/input8.png
	new file:   public/images/input9.png

	modified:   public/assignments/tp-week2.html
	renamed:    public/files/cad1.jpeg -> public/images/cad1.jpeg
	renamed:    public/files/cad10.jpeg -> public/images/cad10.jpeg
	renamed:    public/files/cad11.jpeg -> public/images/cad11.jpeg
	renamed:    public/files/cad12.jpeg -> public/images/cad12.jpeg
	renamed:    public/files/cad13.jpeg -> public/images/cad13.jpeg
	renamed:    public/files/cad14.jpeg -> public/images/cad14.jpeg
	renamed:    public/files/cad15.jpeg -> public/images/cad15.jpeg
	renamed:    public/files/cad16.jpeg -> public/images/cad16.jpeg
	renamed:    public/files/cad17.jpeg -> public/images/cad17.jpeg
	renamed:    public/files/cad18.jpeg -> public/images/cad18.jpeg
	renamed:    public/files/cad19.jpeg -> public/images/cad19.jpeg
	renamed:    public/files/cad2.jpeg -> public/images/cad2.jpeg
	renamed:    public/files/cad20.jpeg -> public/images/cad20.jpeg
	renamed:    public/files/cad21.jpeg -> public/images/cad21.jpeg
	renamed:    public/files/cad22.jpeg -> public/images/cad22.jpeg
	renamed:    public/files/cad23.jpeg -> public/images/cad23.jpeg
	renamed:    public/files/cad24.jpeg -> public/images/cad24.jpeg
	renamed:    public/files/cad25.jpeg -> public/images/cad25.jpeg
	renamed:    public/files/cad3.jpeg -> public/images/cad3.jpeg
	renamed:    public/files/cad4.jpeg -> public/images/cad4.jpeg
	renamed:    public/files/cad5.jpeg -> public/images/cad5.jpeg
	renamed:    public/files/cad6.jpeg -> public/images/cad6.jpeg
	renamed:    public/files/cad7.jpeg -> public/images/cad7.jpeg
	renamed:    public/files/cad8.jpeg -> public/images/cad8.jpeg
	renamed:    public/files/cad9.jpeg -> public/images/cad9.jpeg

	new file:   public/files/cad1.jpeg
	new file:   public/files/cad10.jpeg
	new file:   public/files/cad11.jpeg
	new file:   public/files/cad12.jpeg
	new file:   public/files/cad13.jpeg
	new file:   public/files/cad14.jpeg
	new file:   public/files/cad15.jpeg
	new file:   public/files/cad16.jpeg
	new file:   public/files/cad17.jpeg
	new file:   public/files/cad18.jpeg
	new file:   public/files/cad19.jpeg
	new file:   public/files/cad2.jpeg
	new file:   public/files/cad20.jpeg
	new file:   public/files/cad21.jpeg
	new file:   public/files/cad22.jpeg
	new file:   public/files/cad23.jpeg
	new file:   public/files/cad24.jpeg
	new file:   public/files/cad25.jpeg
	new file:   public/files/cad3.jpeg
	new file:   public/files/cad4.jpeg
	new file:   public/files/cad5.jpeg
    new file:   public/files/cad6.jpeg
	new file:   public/files/cad7.jpeg
	new file:   public/files/cad8.jpeg
	new file:   public/files/cad9.jpeg

Merge branch 'main' of ssh://gitlab.fabcloud.org/academany/fabacademy/2024/labs/hopelab/students/thomas-pupo

	modified:   public/images/.DS_Store