From 7e064741141e74d8e54d3202c3f4dbab54b486fa Mon Sep 17 00:00:00 2001
From: duckduckdoof <duckduckdoof@gmail.com>
Date: Tue, 21 Jan 2025 16:46:51 -0500
Subject: [PATCH] Updated readme

---
 README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/README.md b/README.md
index fc95282..6fc02c5 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,19 @@
 # my-sim-game
+<<<<<<< Updated upstream
 A quicker, easier version of Mycropolis, using Python Arcade
+=======
+
+A quicker, easier version of Mycropolis
+
+Author: Caleb Scott
+
+---
+
+# Libraries and Software
+
+This project uses: 
+
+* [Python Arcade](https://api.arcade.academy/en/latest/index.html) as the game engine (instead of PyGame)
+* [Tiled](https://www.mapeditor.org/) for tilemapping
+* [Aseprite](https://www.aseprite.org/) for tiles/textures.
+>>>>>>> Stashed changes