Merge branch 'main' into feat/date-component

# Conflicts:
#	src/common/mod.rs
#	src/components/mod.rs

src/pages/api/mod.rs

@@ -0,0 +1,4 @@
+mod comparisons;
+mod scholarships;
+
+pub use self::{comparisons::*, scholarships::*};