feat: add williamb, update amy pics, combine about and tutors, update policies and subjects

9 files changed, 134 insertions, 90 deletions

diff --git a/about/index.php b/about/index.php
index 0b09bfc..0ec1b20 100644
--- a/about/index.php
+++ b/about/index.php
@@ -1,49 +1,114 @@
 <?php include('../header.php'); ?>
 <section class="banner">
-	<h1>About Me</h1>
+	<h1>About Us</h1>
 </section>
 
-<section class="quiet">
-	<h2>
+<section class="quiet squarshed">
+	<p>
+	<h2 style="font-size: 1.5em; text-align: center;">
 		School is tricky, and there is no universal pathway to success. I started
 		Carpenter Tutoring for those seeking a little help finding their way.
 	</h2>
-
-	<p>
-		I received my B.A. from The College of William and Mary in 2018 and received
-		my M.Ed. from W&amp;M in 2020. As an undergraduate, I worked and was trained
-		as a tutor at W&amp;M's peer tutoring center, the Tribe TutorZone. During
-		this period, I conducted over 150 one-on-one appointments with W&amp;M
-		students in 26 different content areas. I earned lifetime Advanced Tutor
-		Certification, the highest level W&amp;M can grant, through the College
-		Reading and Learning Association, and I was trained as a time management
-		consultant. I took on leadership roles within the TutorZone until I was
-		working alongside its director. As a graduate student, I became one of the
-		Graduate Assistants helping oversee the TutorZone as well as an academic
-		coach to students with high need for academic support.
 	</p>
+</section>
 
-	<p>
-		I loved getting to work with the Tribe TutorZone tutors, but I realized that
-		I missed being the tutor. There's just nothing like watching the light bulb
-		of understanding go off or seeing students who had struggled with material
-		master it! With that realization, I decided to dedicate my life to my
-		passion -- helping students of all ages learn, succeed, and believe in
-		themselves.
-	</p>
+<section class="quiet flexible squarshed">
+	<figure class="shadowy">
+		<picture>
+			<source srcset="/assets/amy.webp" type="image/webp" />
+			<source srcset="/assets/amy.png" type="image/png" />
+			<img alt="Amy Carpenter" src="/assets/amy.png" />
+		</picture>
+		<figcaption>Amy Carpenter, M.Ed.</figcaption>
+	</figure>
 
-	<p>
-		My instructional approach focuses on meeting students where they are and
-		supporting them through any hesitations or discomforts from which academic
-		difficulties may arise. Whether your student only has to brush up on a few
-		concepts or is resistant to completing coursework, I will come to each
-		session with patience, understanding, and just the right amount of
-		discipline. I truly believe that excellent educational relationships begin
-		with mutual respect, and I work to build meaningful relationships with all
-		of my clients.
-	</p>
+	<div>
+		<p>
+			I received my B.A. from The College of William and Mary in 2018 and received
+			my M.Ed. from W&amp;M in 2020. As an undergraduate, I worked and was trained
+			as a tutor at W&amp;M's peer tutoring center, the Tribe TutorZone. During
+			this period, I conducted over 150 one-on-one appointments with W&amp;M
+			students in 26 different content areas. I earned lifetime Advanced Tutor
+			Certification, the highest level W&amp;M can grant, through the College
+			Reading and Learning Association, and I was trained as a time management
+			consultant. I took on leadership roles within the TutorZone until I was
+			working alongside its director. As a graduate student, I became one of the
+			Graduate Assistants helping oversee the TutorZone as well as an academic
+			coach to students with high need for academic support.
+		</p>
+
+		<p>
+			I loved getting to work with the Tribe TutorZone tutors, but I realized that
+			I missed being the tutor. There's just nothing like watching the light bulb
+			of understanding go off or seeing students who had struggled with material
+			master it! With that realization, I decided to dedicate my life to my
+			passion -- helping students of all ages learn, succeed, and believe in
+			themselves.
+		</p>
+
+		<p>
+			My instructional approach focuses on meeting students where they are and
+			supporting them through any hesitations or discomforts from which academic
+			difficulties may arise. Whether your student only has to brush up on a few
+			concepts or is resistant to completing coursework, I will come to each
+			session with patience, understanding, and just the right amount of
+			discipline. I truly believe that excellent educational relationships begin
+			with mutual respect, and I work to build meaningful relationships with all
+			of my clients.
+		</p>
+
+		<p>Thank you for considering Carpenter Tutoring.</p>
+	</div>
+
+</section>
+
+<section class="quiet flexible">
+	<div>
+		<h2>Joel Monroe</h2>
+		<p>
+
+			Joel has been a math nerd since he first discovered the number 11. Since then, he has worked to develop his skills in both studying and teaching math. Joel earned his Bachelor's in Mathematics and his Master's in Computational Operations Research from the College of William &amp; Mary. Throughout his education, he has consistently sought opportunities to tutor, whether it was helping friends in high school, peers in college, or other students during his Master's program. Joel has a passion for seeing students break through the barriers which can form when studying math and discover the amazing language hidden within. As a part of Carpenter Tutoring, Joel is happy to offer assistance to students in high school and college math and introductory physics.
+		</p>
+	</div>
+
+	<figure class="shadowy">
+		<picture>
+			<source srcset="/assets/joelm.webp" type="image/webp" />
+			<source srcset="/assets/joelm.png" type="image/png" />
+			<img alt="Joel Monroe" src="/assets/joelm.png" />
+		</picture>
+		<figcaption>Joel Monroe, M.Sc.</figcaption>
+	</figure>
+
+</section>
+
+
+<section class="quiet flexible">
+	<div>
+		<h2>William Brubaker</h2>
+		<p>
+			William Brubaker graduated from the University of California at Berkeley
+			with degrees in Architecture and Business Administration. He subsequently
+			worked as project manager for real estate developers of very large
+			commercial projects in multiple cities in the United States and in Abu
+			Dhabi and Hong Kong. In 2011, William began tutoring GMAT prep and later,
+			GRE prep, full time and has done that ever since. Over the past 11 years
+			he has tutored over 7,500 hours to hundreds of students. During that time
+			he has gradually developed a structured system designed to optimize
+			graduate students' tutoring experience. William is the father of three
+			children and lives in the foothills of the Sierra Nevada Mountains in
+			California.
+		</p>
+	</div>
 
-	<p>Thank you for considering Carpenter Tutoring.</p>
+	<figure class="shadowy">
+		<picture>
+			<source srcset="/assets/williamb.webp" type="image/webp" />
+			<source srcset="/assets/williamb.png" type="image/png" />
+			<img alt="William Brubaker" src="/assets/williamb.png" />
+		</picture>
+		<figcaption>William Brubaker</figcaption>
+	</figure>
 
 </section>
 <section></section>
diff --git a/assets/amy-sunny.png b/assets/amy-sunny.png
new file mode 100644
index 0000000..003c700
--- /dev/null
+++ b/assets/amy-sunny.png
diff --git a/assets/amy-sunny.webp b/assets/amy-sunny.webp
new file mode 100644
index 0000000..680335f
--- /dev/null
+++ b/assets/amy-sunny.webp
diff --git a/assets/williamb.png b/assets/williamb.png
new file mode 100644
index 0000000..f11df20
--- /dev/null
+++ b/assets/williamb.png
diff --git a/assets/williamb.webp b/assets/williamb.webp
new file mode 100644
index 0000000..ef9b567
--- /dev/null
+++ b/assets/williamb.webp
diff --git a/header.php b/header.php
index af9fb51..86208c9 100644
--- a/header.php
+++ b/header.php
@@ -96,6 +96,11 @@
 			background-color: white;
 		}
 
+		section.squarshed {
+			padding-bottom: 1em;
+			padding-top: 1em;
+		}
+
 		.button img {
 			margin-right: 1em;
 		}
@@ -289,7 +294,6 @@
 	<nav>
 		<a href="/#contact">Contact Me</a>
 		<a href="/#reviews">Reviews</a>
-		<a href="/tutors">Tutors</a>
 		<a href="/about">About</a>
 		<a href="/policies">Policies</a>
 		<a href="/#pricing">Pricing</a>
diff --git a/index.php b/index.php
index 22d3504..c2534c8 100644
--- a/index.php
+++ b/index.php
@@ -34,17 +34,17 @@ include('header.php');
 		</h2>
 
 		<p> Carpenter Tutoring is a private tutoring service based in Suffolk,
-			Virginia. I offer high-engagement remote appointments through Zoom. A limited
-			number of in-person appointments are also available for students in the Harbour
-			View region of Suffolk, VA. Most of my offerings are one-on-one, and siblings
+			Virginia. We offer high-engagement remote appointments through Zoom. A limited
+			number of in-person appointments with me are also available for students in the Harbour
+			View region of Suffolk, VA. Most of our offerings are one-on-one, and siblings
 			and pre-existing groups of students may opt for group meetings. No matter your
 			budget, I am confident that we can find an arrangement that will provide your
 			student services without creating financial strain. </p>
 
 		<p>
-			I invite you to explore my site to learn more about the <a href="/#offerings">services I offer</a>, <a href="/about">my background</a>,
-			and some of <a href="/policies">my policies</a>. Thank you for visiting, and
-			please do not hesitate to reach out with any questions. I would be thrilled to
+			I invite you to explore and learn more about the <a href="/#offerings">services we offer</a>, <a href="/about">Carpenter Tutoring's background</a>,
+			and some of <a href="/policies">our policies</a>. Thank you for visiting, and
+			please do not hesitate to reach out with any questions. We will be thrilled to
 			assist you!
 		</p>
 
@@ -60,9 +60,9 @@ include('header.php');
 
 	<figure class="shadowy">
 		<picture>
-			<source srcset="/assets/amy.webp" type="image/webp" />
-			<source srcset="/assets/amy.png" type="image/png" />
-			<img alt="Amy Carpenter" src="/assets/amy.png" />
+			<source srcset="/assets/amy-sunny.webp" type="image/webp" />
+			<source srcset="/assets/amy-sunny.png" type="image/png" />
+			<img alt="Amy Carpenter" src="/assets/amy-sunny.png" />
 		</picture>
 		<figcaption>Amy Carpenter, M.Ed.</figcaption>
 	</figure>
@@ -72,15 +72,15 @@ include('header.php');
 <div id="offering-subject-tutoring" class="modal">
 	<div class="card">
 		<p>
-			My regular subject specific offerings include:
+			Our regular subject specific offerings include:
 
 		<ul>
 			<li> All levels of reading/language arts/English</li>
 			<li> Writing (formal and creative)</li>
 			<li> All levels of Latin</li>
-			<li> Math through Precalculus</li>
-			<li> Introductory Biology, Physics, and Chemistry (not at the honors or AP
-				level)</li>
+			<li> Math through Calculus II</li>
+			<li> Introductory Physics (not at the honors or AP level)</li>
+			<li> Biology and Chemistry through AP level</li>
 		</ul>
 
 		Special arrangements can be made for subjects that fall outside of these
@@ -117,6 +117,7 @@ include('header.php');
 			<li> ISEE</li>
 			<li> SSAT</li>
 			<li> GED</li>
+			<li> GMAT</li>
 			<li> MAT</li>
 			<li> GRE</li>
 			<li> LSAT</li>
@@ -348,7 +349,7 @@ include('header.php');
 
 	<h3>
 		<p><em>*In-person pricing for students in the Harbour View region of Suffolk is $10/hr more in each category.</em></p>
-		<a href="/policies">See a list of my policies and procedures regarding scheduling,
+		<a href="/policies">See a list of our policies and procedures regarding scheduling,
 			payment, and booking.</a>
 	</h3>
 
diff --git a/policies/index.php b/policies/index.php
index 631f9f3..5a64619 100644
--- a/policies/index.php
+++ b/policies/index.php
@@ -5,44 +5,44 @@
 <section class="quiet">
 	<p>
 	<h2>Payment Methods</h2>
-	I accept payments through Zelle (amy@carpentertutoring.com), Venmo
-	(@AmyCTutoring), and PayPal (amy@carpentertutoring.com). I also accept cash and
-	checks made out to Amy Carpenter. Please <a href="/#contact">contact me</a> for
+	We accept payments through Zelle (amy@carpentertutoring.com), Venmo
+	(@AmyCTutoring), and PayPal (amy@carpentertutoring.com). We also accept
+	checks made out to Carpenter Tutoring, LLC. Please <a href="/#contact">contact Amy</a> for
 	a mailing address if you would like to pay by check.
 	</p>
 
 	<p>
-	<h2>Travel policy</h2>
-	Due to high appointment volumes, I am only able to travel to students in the Harbour View area of Suffolk, VA.
+	<h2>Travel</h2>
+	Due to high appointment volumes, Amy is only able to travel to students in the Harbour View area of Suffolk, VA.
 	</p>
 
+	<p>Please contact other tutors directly to discuss their locations and in-person policies.</p>
+
 	<p>
 	<h2>Remote sessions</h2>
-	Remote sessions are conducted from my home in Suffolk. I generally use
-	<a target="_blank" href="https://zoom.us">Zoom</a>, which requires students to
-	download a free client on their computer or a free app on their phone
-	or tablet. I am happy to accommodate if you prefer a different
-	service.
+	Remote sessions are typically conducted from tutors' homes. We use online video conferencing software such as
+	<a target="_blank" href="https://zoom.us">Zoom</a> and <a target="_blank" href="https://meet.google.com">Google Meet</a>.
+	Your tutor will inform you of their preferred meeting method and provide initial meeting instructions and support.
 	</p>
 
 	<p>
-	<h2>Cancellation policy</h2>
+	<h2>Late Cancellations</h2>
 	Sessions cancelled within 72 hours of their start time will incur a late
 	cancellation fee equal to 40% of the cancelled session price.
 	</p>
 
 	<p>
-	<h2>No-Show policy</h2>
+	<h2>No-Shows</h2>
 	Sessions which a student does not attend with no notice of
 	cancellation will be charged the full session price.
 	</p>
 
 	<p>
-	<h2>Session Duration policy</h2>
+	<h2>Session Duration</h2>
 	Sessions are purchased in half-hour increments, and the shortest
 	appointment duration is 60 minutes. Families are responsible for the
 	amount of time they book and will be charged based on that amount.
-	Students who provide no advance notice of a need to end their meeting early will still be responsible for the full session price.  If a student is
+	Students who provide no advance notice of a need to end their meeting early will still be responsible for the full session price. If a student is
 	late to their appointment, we will work to the end of their scheduled
 	time, but no later.
 	</p>
diff --git a/tutors/index.php b/tutors/index.php
deleted file mode 100644
index b4c347c..0000000
--- a/tutors/index.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php include('../header.php'); ?>
-<section class="banner">
-	<h1>Our Tutors</h1>
-</section>
-
-<section class="quiet flexible">
-	<div>
-		<h2>Joel Monroe</h2>
-		<p>
-
-			Joel Monroe has been a math nerd since he first discovered the number 11. Since then, he has worked to develop his skills in both studying and teaching math. Joel earned his Bachelor's in Mathematics and his Master's in Computational Operations Research from the College of William &amp; Mary. Throughout his education, he has consistently sought opportunities to tutor, whether it was helping friends in high school, peers in college, or other students during his Master's program. Joel has a passion for seeing students break through the barriers which can form when studying math and discover the amazing language hidden within. As a part of Carpenter Tutoring, Joel is happy to offer assistance to students in high school and college math and introductory physics.
-		</p>
-	</div>
-
-	<figure class="shadowy">
-		<picture>
-			<source srcset="/assets/joelm.webp" type="image/webp" />
-			<source srcset="/assets/joelm.png" type="image/png" />
-			<img alt="Joel Monroe" src="/assets/joelm.png" />
-		</picture>
-		<figcaption>Joel Monroe, M.Sc.</figcaption>
-	</figure>
-
-</section>
-<section></section>
-<?php include('../footer.php'); ?>