Fix merge conflict

Author: glokta1

compiled_starters/c/.gitattributes

@@ -0,0 +1 @@
+* text=auto

compiled_starters/c/README.md

@@ -0,0 +1,35 @@
+![progress-banner](https://codecrafters.io/landing/images/default_progress_banners/shell.png)
+
+This is a starting point for C solutions to the
+["Build Your Own Shell" Challenge](https://app.codecrafters.io/courses/shell/overview).
+
+In this challenge, you'll build your own POSIX compliant shell that's capable of
+interpreting shell commands, running external programs and builtin commands like
+cd, pwd, echo and more. Along the way, you'll learn about shell command parsing,
+REPLs, builtin commands, and more.
+
+**Note**: If you're viewing this repo on GitHub, head over to
+[codecrafters.io](https://codecrafters.io) to try the challenge.
+
+# Passing the first stage
+
+The entry point for your `shell` implementation is in `app/main.c`. Study and
+uncomment the relevant code, and push your changes to pass the first stage:
+
+```sh
+git add .
+git commit -m "pass 1st stage" # any msg
+git push origin master
+```
+
+Time to move on to the next stage!
+
+# Stage 2 & beyond
+
+Note: This section is for stages 2 and beyond.
+
+1. Ensure you have `c (9.2)` installed locally
+1. Run `./your_shell.sh` to run your program, which is implemented in
+   `app/main.c`.
+1. Commit your changes and run `git push origin master` to submit your solution
+   to CodeCrafters. Test output will be streamed to your terminal.

compiled_starters/c/app/main.c

@@ -0,0 +1,15 @@
+#include <stdio.h>
+
+int main() {
+  // You can use print statements as follows for debugging, they'll be visible when running tests
+  printf("Logs from your program will appear here!\n");
+
+  // Uncomment this block to pass the first stage
+  // printf("$ ");
+  // fflush(stdout);
+
+  // Wait for user input
+  char input[100];
+  fgets(input, 100, stdin);
+  return 0;
+}

compiled_starters/c/codecrafters.yml

@@ -0,0 +1,11 @@
+# Set this to true if you want debug logs.
+#
+# These can be VERY verbose, so we suggest turning them off
+# unless you really need them.
+debug: false
+
+# Use this to change the C version used to run your code
+# on Codecrafters.
+#
+# Available versions: c-9.2
+language_pack: c-9.2

compiled_starters/c/your_shell.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# DON'T EDIT THIS!
+#
+# CodeCrafters uses this file to test your code. Don't make any changes here!
+#
+# DON'T EDIT THIS!
+set -e
+tmpFile=$(mktemp)
+gcc app/*.c -o $tmpFile
+exec $tmpFile "$@"

compiled_starters/javascript/.gitattributes

@@ -0,0 +1 @@
+* text=auto

compiled_starters/javascript/.gitignore

@@ -0,0 +1 @@
+node_modules/

compiled_starters/javascript/README.md

@@ -0,0 +1,35 @@
+![progress-banner](https://codecrafters.io/landing/images/default_progress_banners/shell.png)
+
+This is a starting point for JavaScript solutions to the
+["Build Your Own Shell" Challenge](https://app.codecrafters.io/courses/shell/overview).
+
+In this challenge, you'll build your own POSIX compliant shell that's capable of
+interpreting shell commands, running external programs and builtin commands like
+cd, pwd, echo and more. Along the way, you'll learn about shell command parsing,
+REPLs, builtin commands, and more.
+
+**Note**: If you're viewing this repo on GitHub, head over to
+[codecrafters.io](https://codecrafters.io) to try the challenge.
+
+# Passing the first stage
+
+The entry point for your `shell` implementation is in `app/main.js`. Study and
+uncomment the relevant code, and push your changes to pass the first stage:
+
+```sh
+git add .
+git commit -m "pass 1st stage" # any msg
+git push origin master
+```
+
+Time to move on to the next stage!
+
+# Stage 2 & beyond
+
+Note: This section is for stages 2 and beyond.
+
+1. Ensure you have `node (21)` installed locally
+1. Run `./your_shell.sh` to run your program, which is implemented in
+   `app/main.js`.
+1. Commit your changes and run `git push origin master` to submit your solution
+   to CodeCrafters. Test output will be streamed to your terminal.

compiled_starters/javascript/app/main.js

@@ -0,0 +1,15 @@
+// Uncomment this block to pass the first stage
+// const readline = require("readline");
+
+// You can use print statements as follows for debugging, they'll be visible when running tests.
+console.log("Logs from your program will appear here!");
+
+// Uncomment this block to pass the first stage
+// const rl = readline.createInterface({
+//   input: process.stdin,
+//   output: process.stdout,
+// });
+//
+// rl.question("$ ", (answer) => {
+//   rl.close();
+// });

compiled_starters/javascript/codecrafters.yml

@@ -0,0 +1,11 @@
+# Set this to true if you want debug logs.
+#
+# These can be VERY verbose, so we suggest turning them off
+# unless you really need them.
+debug: false
+
+# Use this to change the JavaScript version used to run your code
+# on Codecrafters.
+#
+# Available versions: nodejs-21
+language_pack: nodejs-21