merge conflict changes

Author: Palash Patel

LICENSE

@@ -1,4 +1,6 @@
-MIT License
+# LICENSE
+
+## cs-2340-team-website
 
 Copyright (c) 2025 Aryamann Sheoran, James Kerrane, Michael Wittland Jr.,
 Palash Patel, Shane Hanley
@@ -21,8 +23,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
-[twbs/examples](https://github.com/twbs/examples/)
-
+## [Bootstrap Examples](https://github.com/twbs/examples/)
 MIT License
 
 Copyright (c) 2022 Bootstrap
@@ -44,3 +45,8 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+## Dots world map
+[Dots world map](https://www.deviantart.com/snowfleikun/art/Dots-world-map-179891314)
+by [sNowFleikuN](https://www.deviantart.com/snowfleikun) is licensed under
+[CC BY 3.0](https://creativecommons.org/licenses/by/3.0/).

mdx-components.tsx

@@ -0,0 +1,7 @@
+import type { MDXComponents } from 'mdx/types'
+ 
+export function useMDXComponents(components: MDXComponents): MDXComponents {
+  return {
+    ...components,
+  }
+}

next.config.js

@@ -1,12 +1,19 @@
+import createMDX from '@next/mdx'
+
 /** @type {import('next').NextConfig} */
 const nextConfig = {
+  // Configure `pageExtensions` to include markdown and MDX files
+  pageExtensions: ['js', 'jsx', 'md', 'mdx', 'ts', 'tsx'],
+  
   // Allow for static publishing on GitHub Pages at subdomain https://thatrobotdev.github.io/cs-2340-team-website/
   basePath: "/cs-2340-team-website",
+  
   /**
    * Enable static export to allow for HTML/CSS/JS static assets hosting on GitHub Pages
    * @see https://nextjs.org/docs/pages/building-your-application/deploying/static-exports
    */
   output: "export",
+  
   /**
    * Disable server-based image optimization. Next.js does not support
    * dynamic features with static exports.
@@ -16,7 +23,24 @@ const nextConfig = {
   images: {
     unoptimized: true,
   },
+
   reactStrictMode: true,
+
+  webpack(config, { isServer }) {
+    // Allow importing of `.txt` files using raw-loader
+    config.module.rules.push({
+      test: /LICENSE$/,  // Specify the file type to match
+      use: 'raw-loader',  // Use raw-loader to load the file
+    });
+
+    // Return the modified config
+    return config;
+  },
 }
 
-module.exports = nextConfig
+const withMDX = createMDX({
+  // Add markdown plugins here if needed
+})
+
+// Merge MDX config with Next.js config and export
+export default withMDX(nextConfig)