Merge branch 'devBranch'

acmatku · Nov 19, 2023 · 58d3fbc · 58d3fbc
2 parents 047359e + 114499a
commit 58d3fbc
Show file tree

Hide file tree

Showing 51 changed files with 2,170 additions and 1,200 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,5 @@
+<<<<<<< Updated upstream
+
+=======
+>>>>>>> Stashed changes
+assets/.DS_Store
diff --git a/assets/.DS_Store b/assets/.DS_Store
diff --git a/assets/img/.DS_Store b/assets/img/.DS_Store
diff --git a/assets/img/devweek.jpg b/assets/img/devweek.jpg
diff --git a/assets/img/ico.png b/assets/img/ico.png
diff --git a/assets/img/officers/Delroy_Wright.jpg b/assets/img/officers/Delroy_Wright.jpg
diff --git a/assets/img/officers/Ng Alexis - 2022 - DSC_0935.JPG b/assets/img/officers/Ng Alexis - 2022 - DSC_0935.JPG
diff --git a/assets/img/officers/alexisgray.jpeg b/assets/img/officers/alexisgray.jpeg
diff --git a/assets/img/officers/andrew_huang.jpg b/assets/img/officers/andrew_huang.jpg
diff --git a/assets/img/officers/chris.jpg b/assets/img/officers/chris.jpg
diff --git a/assets/img/officers/dylan_kneidel.jpg b/assets/img/officers/dylan_kneidel.jpg
diff --git a/assets/img/officers/eric.jpg b/assets/img/officers/eric.jpg
diff --git a/assets/img/officers/ethan.jpg b/assets/img/officers/ethan.jpg
diff --git a/assets/img/officers/harry.jpg b/assets/img/officers/harry.jpg
diff --git a/assets/img/officers/jack.jpeg b/assets/img/officers/jack.jpeg
diff --git a/assets/img/officers/james_hurd.jpg b/assets/img/officers/james_hurd.jpg
diff --git a/assets/img/officers/jonathan.jpg b/assets/img/officers/jonathan.jpg
diff --git a/assets/img/officers/joshua_lee.jpeg b/assets/img/officers/joshua_lee.jpeg
diff --git a/assets/img/officers/myra.png b/assets/img/officers/myra.png
diff --git a/assets/img/officers/nina.jpg b/assets/img/officers/nina.jpg
diff --git a/assets/img/officers/placeholder.jpg b/assets/img/officers/placeholder.jpg
diff --git a/assets/img/officers/rohan.jpg b/assets/img/officers/rohan.jpg
diff --git a/assets/img/officers/ryan.png b/assets/img/officers/ryan.png
diff --git a/assets/img/officers/sandy.png b/assets/img/officers/sandy.png
diff --git a/assets/img/officers/vivian_lara.jpeg b/assets/img/officers/vivian_lara.jpeg
diff --git a/assets/img/officers/will_whitehead.JPG b/assets/img/officers/will_whitehead.JPG
diff --git a/assets/img/officers/zach.jpg b/assets/img/officers/zach.jpg
diff --git a/assets/img/officers/zoekulphong.jpg b/assets/img/officers/zoekulphong.jpg
diff --git a/assets/img/portfolio/fullsize/1.jpg b/assets/img/portfolio/fullsize/1.jpg
diff --git a/assets/img/portfolio/fullsize/2.jpg b/assets/img/portfolio/fullsize/2.jpg
diff --git a/assets/img/portfolio/fullsize/3.jpg b/assets/img/portfolio/fullsize/3.jpg
diff --git a/assets/img/portfolio/fullsize/4.jpg b/assets/img/portfolio/fullsize/4.jpg
diff --git a/assets/img/portfolio/fullsize/5.jpg b/assets/img/portfolio/fullsize/5.jpg
diff --git a/assets/img/portfolio/fullsize/6.jpg b/assets/img/portfolio/fullsize/6.jpg
diff --git a/assets/img/portfolio/thumbnails/1.jpg b/assets/img/portfolio/thumbnails/1.jpg
diff --git a/assets/img/portfolio/thumbnails/2.jpg b/assets/img/portfolio/thumbnails/2.jpg
diff --git a/assets/img/portfolio/thumbnails/3.jpg b/assets/img/portfolio/thumbnails/3.jpg
diff --git a/assets/img/portfolio/thumbnails/4.jpg b/assets/img/portfolio/thumbnails/4.jpg
diff --git a/assets/img/portfolio/thumbnails/5.jpg b/assets/img/portfolio/thumbnails/5.jpg
diff --git a/assets/img/portfolio/thumbnails/6.jpg b/assets/img/portfolio/thumbnails/6.jpg
diff --git a/assets/img/utd_x.jpg b/assets/img/utd_x.jpg
diff --git a/assets/img/weekly.jpg b/assets/img/weekly.jpg
diff --git a/css/freelance.css b/css/freelance.css